git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6 into devel
[sfrench/cifs-2.6.git]
/
drivers
/
mmc
/
host
/
Kconfig
diff --git
a/drivers/mmc/host/Kconfig
b/drivers/mmc/host/Kconfig
index b4cf691f3f64ec9cdbbc2792d32ae35bbf37bbfe..3eb87bda14f3e169af1999ae888212ce8a9332dd 100644
(file)
--- a/
drivers/mmc/host/Kconfig
+++ b/
drivers/mmc/host/Kconfig
@@
-155,7
+155,7
@@
config MMC_ATMELMCI_DMA
config MMC_IMX
tristate "Motorola i.MX Multimedia Card Interface support"
config MMC_IMX
tristate "Motorola i.MX Multimedia Card Interface support"
- depends on ARCH_
IMX
+ depends on ARCH_
MX1
help
This selects the Motorola i.MX Multimedia card Interface.
If you have a i.MX platform with a Multimedia Card slot,
help
This selects the Motorola i.MX Multimedia card Interface.
If you have a i.MX platform with a Multimedia Card slot,