From: Andi Kleen Date: Fri, 5 Oct 2012 00:11:50 +0000 (-0700) Subject: sections: fix section conflicts in drivers/macintosh X-Git-Tag: v3.7-rc1~110^2~160 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dd0e981a6cc855a785e43d743c399196c144cdd6;p=thirdparty%2Fkernel%2Flinux.git sections: fix section conflicts in drivers/macintosh [akpm@linux-foundation.org: checkpatch fixes] Signed-off-by: Andi Kleen Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c index 20e5c2cda430e..ef87310b76624 100644 --- a/drivers/macintosh/macio_asic.c +++ b/drivers/macintosh/macio_asic.c @@ -748,7 +748,7 @@ static void __devexit macio_pci_remove(struct pci_dev* pdev) * MacIO is matched against any Apple ID, it's probe() function * will then decide wether it applies or not */ -static const struct pci_device_id __devinitdata pci_ids [] = { { +static const struct pci_device_id __devinitconst pci_ids[] = { { .vendor = PCI_VENDOR_ID_APPLE, .device = PCI_ANY_ID, .subvendor = PCI_ANY_ID,