diff options
author | Pierre Ossman <drzeus@drzeus.cx> | 2008-09-07 07:16:58 -0400 |
---|---|---|
committer | Pierre Ossman <drzeus@drzeus.cx> | 2008-10-12 05:04:36 -0400 |
commit | 57105737f6a0b39305a85ac176cc9fd4a236d8c2 (patch) | |
tree | 7a8fcd27a08655e889d6867058b937f4f7e0372b | |
parent | 1ea4f444f3a9721babd5d22cbd15092f9da6b51a (diff) |
mmc: explicitly mention SDIO support in Kconfig
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
-rw-r--r-- | drivers/mmc/Kconfig | 9 | ||||
-rw-r--r-- | drivers/mmc/card/Kconfig | 2 | ||||
-rw-r--r-- | drivers/mmc/host/Kconfig | 13 |
3 files changed, 13 insertions, 11 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 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | menuconfig MMC | 5 | menuconfig MMC |
6 | tristate "MMC/SD card support" | 6 | tristate "MMC/SD/SDIO card support" |
7 | depends on HAS_IOMEM | 7 | depends on HAS_IOMEM |
8 | help | 8 | help |
9 | MMC is the "multi-media card" bus protocol. | 9 | This selects MultiMediaCard, Secure Digital and Secure |
10 | Digital I/O support. | ||
10 | 11 | ||
11 | If you want MMC support, you should say Y here and also | 12 | If you want MMC/SD/SDIO support, you should say Y here and |
12 | to the specific driver for your MMC interface. | 13 | also to your specific host controller driver. |
13 | 14 | ||
14 | config MMC_DEBUG | 15 | config MMC_DEBUG |
15 | bool "MMC debugging" | 16 | bool "MMC debugging" |
diff --git a/drivers/mmc/card/Kconfig b/drivers/mmc/card/Kconfig index ffd2198e515f..3f2a912659af 100644 --- a/drivers/mmc/card/Kconfig +++ b/drivers/mmc/card/Kconfig | |||
@@ -2,7 +2,7 @@ | |||
2 | # MMC/SD card drivers | 2 | # MMC/SD card drivers |
3 | # | 3 | # |
4 | 4 | ||
5 | comment "MMC/SD Card Drivers" | 5 | comment "MMC/SD/SDIO Card Drivers" |
6 | 6 | ||
7 | config MMC_BLOCK | 7 | config MMC_BLOCK |
8 | tristate "MMC block device driver" | 8 | tristate "MMC block device driver" |
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index 4b81899ba5a8..38468b2bd1af 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig | |||
@@ -2,7 +2,7 @@ | |||
2 | # MMC/SD host controller drivers | 2 | # MMC/SD host controller drivers |
3 | # | 3 | # |
4 | 4 | ||
5 | comment "MMC/SD Host Controller Drivers" | 5 | comment "MMC/SD/SDIO Host Controller Drivers" |
6 | 6 | ||
7 | config MMC_ARMMMCI | 7 | config MMC_ARMMMCI |
8 | tristate "ARM AMBA Multimedia Card Interface support" | 8 | tristate "ARM AMBA Multimedia Card Interface support" |
@@ -141,15 +141,16 @@ config MMC_TIFM_SD | |||
141 | module will be called tifm_sd. | 141 | module will be called tifm_sd. |
142 | 142 | ||
143 | config MMC_SPI | 143 | config MMC_SPI |
144 | tristate "MMC/SD over SPI" | 144 | tristate "MMC/SD/SDIO over SPI" |
145 | depends on SPI_MASTER && !HIGHMEM && HAS_DMA | 145 | depends on SPI_MASTER && !HIGHMEM && HAS_DMA |
146 | select CRC7 | 146 | select CRC7 |
147 | select CRC_ITU_T | 147 | select CRC_ITU_T |
148 | help | 148 | help |
149 | Some systems accss MMC/SD cards using a SPI controller instead of | 149 | Some systems accss MMC/SD/SDIO cards using a SPI controller |
150 | using a "native" MMC/SD controller. This has a disadvantage of | 150 | instead of using a "native" MMC/SD/SDIO controller. This has a |
151 | being relatively high overhead, but a compensating advantage of | 151 | disadvantage of being relatively high overhead, but a compensating |
152 | working on many systems without dedicated MMC/SD controllers. | 152 | advantage of working on many systems without dedicated MMC/SD/SDIO |
153 | controllers. | ||
153 | 154 | ||
154 | If unsure, or if your system has no SPI master driver, say N. | 155 | If unsure, or if your system has no SPI master driver, say N. |
155 | 156 | ||