diff options
author | David Woodhouse | 2008-10-13 18:13:56 +0200 |
---|---|---|
committer | David Woodhouse | 2008-10-13 18:13:56 +0200 |
commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /drivers/mmc/Kconfig | |
parent | Fix autoloading of MacBook Pro backlight driver. (diff) | |
parent | MAINTAINERS: remove colon from headings (diff) | |
download | kernel-qcow2-linux-e758936e02700ff88a0b08b722a3847b95283ef2.tar.gz kernel-qcow2-linux-e758936e02700ff88a0b08b722a3847b95283ef2.tar.xz kernel-qcow2-linux-e758936e02700ff88a0b08b722a3847b95283ef2.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
Diffstat (limited to 'drivers/mmc/Kconfig')
-rw-r--r-- | drivers/mmc/Kconfig | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index c0b41e8bcd9d..f2eeb38efa65 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -3,13 +3,14 @@ # menuconfig MMC - tristate "MMC/SD card support" + tristate "MMC/SD/SDIO card support" depends on HAS_IOMEM help - MMC is the "multi-media card" bus protocol. + This selects MultiMediaCard, Secure Digital and Secure + Digital I/O support. - If you want MMC support, you should say Y here and also - to the specific driver for your MMC interface. + If you want MMC/SD/SDIO support, you should say Y here and + also to your specific host controller driver. config MMC_DEBUG bool "MMC debugging" |