]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
sections: fix section conflicts in drivers/macintosh
authorAndi Kleen <ak@linux.intel.com>
Fri, 28 Sep 2012 00:20:05 +0000 (10:20 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 5 Oct 2012 04:01:15 +0000 (14:01 +1000)
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
drivers/macintosh/macio_asic.c

index 20e5c2cda430e9f0a8ffbab8fbd1fc7e2f8dbf8b..9e849a98ea5b0d11571a4e403185cceb3d6640b8 100644 (file)
@@ -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,