Merge branch 'linus' into x86/pat

[linux-2.6-omap-h63xx.git] / drivers / mmc / card / Kconfig

diff --git a/drivers/mmc/card/Kconfig b/drivers/mmc/card/Kconfig
index a49cb9737cd858c8f36679249b29f86b565426f2..dd0f398ee2f5398593b61100ad58850ca9e9d0b6 100644 (file)
--- a/drivers/mmc/card/Kconfig
+++ b/drivers/mmc/card/Kconfig
@@ -32,3 +32,22 @@ config MMC_BLOCK_BOUNCE
 
          If unsure, say Y here.
 
+config SDIO_UART
+       tristate "SDIO UART/GPS class support"
+       depends on MMC
+       help
+         SDIO function driver for SDIO cards that implements the UART
+         class, as well as the GPS class which appears like a UART.
+
+config MMC_TEST
+       tristate "MMC host test driver"
+       default n
+       help
+         Development driver that performs a series of reads and writes
+         to a memory card in order to expose certain well known bugs
+         in host controllers. The tests are executed by writing to the
+         "test" file in sysfs under each card. Note that whatever is
+         on your card will be overwritten by these tests.
+
+         This driver is only of interest to those developing or
+         testing a host driver. Most people should say N here.