From: Andi Kleen <ak@linux.intel.com>
Date: Fri, 5 Oct 2012 00:11:54 +0000 (-0700)
Subject: sections: fix section conflicts in drivers/mmc
X-Git-Tag: v3.12-rc1~2240^2~158
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6cfe1093ca8ddfc0e50748d370c268aeabf371aa;p=kernel%2Fkernel-generic.git

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>
---

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,