git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[pandora-kernel.git]
/
drivers
/
mmc
/
Kconfig
diff --git
a/drivers/mmc/Kconfig
b/drivers/mmc/Kconfig
index
6c97491
..
c0b41e8
100644
(file)
--- a/
drivers/mmc/Kconfig
+++ b/
drivers/mmc/Kconfig
@@
-2,10
+2,9
@@
# MMC subsystem configuration
#
# MMC subsystem configuration
#
-menu "MMC/SD Card support"
-
-config MMC
- tristate "MMC support"
+menuconfig MMC
+ tristate "MMC/SD card support"
+ depends on HAS_IOMEM
help
MMC is the "multi-media card" bus protocol.
help
MMC is the "multi-media card" bus protocol.
@@
-19,10
+18,12
@@
config MMC_DEBUG
This is an option for use by developers; most people should
say N here. This enables MMC core and driver debugging.
This is an option for use by developers; most people should
say N here. This enables MMC core and driver debugging.
+if MMC
+
source "drivers/mmc/core/Kconfig"
source "drivers/mmc/card/Kconfig"
source "drivers/mmc/host/Kconfig"
source "drivers/mmc/core/Kconfig"
source "drivers/mmc/card/Kconfig"
source "drivers/mmc/host/Kconfig"
-end
menu
+end
if # MMC