diff options
author | Andi Kleen <ak@linux.intel.com> | 2012-10-04 20:11:54 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-05 14:04:42 -0400 |
commit | 6cfe1093ca8ddfc0e50748d370c268aeabf371aa (patch) | |
tree | c4d68b36b40fbdcb340a7d20d3b57670ff560dfb | |
parent | 19afa16f973c1f75bf3a7e70a0f79bcd7232f2b7 (diff) |
sections: fix section conflicts in drivers/mmc
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Chris Ball <cjb@laptop.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/mmc/host/sdhci-pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c index 504da715a41a..9722d43d6140 100644 --- a/drivers/mmc/host/sdhci-pci.c +++ b/drivers/mmc/host/sdhci-pci.c | |||
@@ -653,7 +653,7 @@ static const struct sdhci_pci_fixes sdhci_via = { | |||
653 | .probe = via_probe, | 653 | .probe = via_probe, |
654 | }; | 654 | }; |
655 | 655 | ||
656 | static const struct pci_device_id pci_ids[] __devinitdata = { | 656 | static const struct pci_device_id pci_ids[] __devinitconst = { |
657 | { | 657 | { |
658 | .vendor = PCI_VENDOR_ID_RICOH, | 658 | .vendor = PCI_VENDOR_ID_RICOH, |
659 | .device = PCI_DEVICE_ID_RICOH_R5C822, | 659 | .device = PCI_DEVICE_ID_RICOH_R5C822, |