diff options
author | Andi Kleen <ak@linux.intel.com> | 2012-10-04 17:11:54 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-06 03:04:42 +0900 |
commit | 6cfe1093ca8ddfc0e50748d370c268aeabf371aa (patch) | |
tree | c4d68b36b40fbdcb340a7d20d3b57670ff560dfb /drivers/mmc/host/sdhci-pci.c | |
parent | 19afa16f973c1f75bf3a7e70a0f79bcd7232f2b7 (diff) | |
download | op-kernel-dev-6cfe1093ca8ddfc0e50748d370c268aeabf371aa.zip op-kernel-dev-6cfe1093ca8ddfc0e50748d370c268aeabf371aa.tar.gz |
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>
Diffstat (limited to 'drivers/mmc/host/sdhci-pci.c')
-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 504da71..9722d43 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 = { .probe = via_probe, }; -static const struct pci_device_id pci_ids[] __devinitdata = { +static const struct pci_device_id pci_ids[] __devinitconst = { { .vendor = PCI_VENDOR_ID_RICOH, .device = PCI_DEVICE_ID_RICOH_R5C822, |