projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
19afa16
)
sections: fix section conflicts in drivers/mmc
author
Andi Kleen
<ak@linux.intel.com>
Fri, 5 Oct 2012 00:11:54 +0000
(17:11 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Fri, 5 Oct 2012 18:04:42 +0000
(
03:04
+0900)
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>
drivers/mmc/host/sdhci-pci.c
patch
|
blob
|
history
diff --git
a/drivers/mmc/host/sdhci-pci.c
b/drivers/mmc/host/sdhci-pci.c
index
504da71
..
9722d43
100644
(file)
--- 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[] __devinit
data
= {
+static const struct pci_device_id pci_ids[] __devinit
const
= {
{
.vendor = PCI_VENDOR_ID_RICOH,
.device = PCI_DEVICE_ID_RICOH_R5C822,