diff options
| author | Andi Kleen <ak@linux.intel.com> | 2012-10-04 17:11:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-06 03:04:41 +0900 |
| commit | dd0e981a6cc855a785e43d743c399196c144cdd6 (patch) | |
| tree | 9b78b1708fbb4af5118c37e7e262b3c942b9e596 /drivers/macintosh | |
| parent | e6b53703b9966a3636be2bd4b7b8e0bfeb1b3f8d (diff) | |
| download | talos-obmc-linux-dd0e981a6cc855a785e43d743c399196c144cdd6.tar.gz talos-obmc-linux-dd0e981a6cc855a785e43d743c399196c144cdd6.zip | |
sections: fix section conflicts in drivers/macintosh
[akpm@linux-foundation.org: checkpatch fixes]
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>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/macintosh')
| -rw-r--r-- | drivers/macintosh/macio_asic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c index 20e5c2cda430..ef87310b7662 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, |
