Staging: Merge staging-next into Linus's tree

[sfrench/cifs-2.6.git] / drivers / mmc / host / Kconfig

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index f06d06e7fdfa06683d883f26397ace3d9f63970e..d25e22cee4c41c921a00bbbef584083d1862a2a4 100644 (file)
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -432,3 +432,12 @@ config MMC_SH_MMCIF
          This selects the MMC Host Interface controler (MMCIF).
 
          This driver supports MMCIF in sh7724/sh7757/sh7372.
+
+config MMC_JZ4740
+       tristate "JZ4740 SD/Multimedia Card Interface support"
+       depends on MACH_JZ4740
+       help
+         This selects support for the SD/MMC controller on Ingenic JZ4740
+         SoCs.
+         If you have a board based on such a SoC and with a SD/MMC slot,
+         say Y or M here.