From 7376a253eddff9f85e1c8faaf28208ac7c7ac63a Mon Sep 17 00:00:00 2001
From: Pierre Ossman <drzeus@drzeus.cx>
Date: Sun, 7 Sep 2008 13:07:57 +0200
Subject: [PATCH] --- yaml --- r: 113189 b: refs/heads/master c:
 1ea4f444f3a9721babd5d22cbd15092f9da6b51a h: refs/heads/master i:   113187:
 5b3737177bcd9310be8ee82fabd56b138a799358 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/mmc/card/Kconfig | 1 -
 trunk/drivers/mmc/host/Kconfig | 6 +++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 163eae332d37..7f9a9b27bfcd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee63a7d2287c677ed022bf3f584f5a187b6c402f
+refs/heads/master: 1ea4f444f3a9721babd5d22cbd15092f9da6b51a
diff --git a/trunk/drivers/mmc/card/Kconfig b/trunk/drivers/mmc/card/Kconfig
index dd0f398ee2f5..ffd2198e515f 100644
--- a/trunk/drivers/mmc/card/Kconfig
+++ b/trunk/drivers/mmc/card/Kconfig
@@ -34,7 +34,6 @@ config MMC_BLOCK_BOUNCE
 
 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.
diff --git a/trunk/drivers/mmc/host/Kconfig b/trunk/drivers/mmc/host/Kconfig
index ea8d7a3490d9..4b81899ba5a8 100644
--- a/trunk/drivers/mmc/host/Kconfig
+++ b/trunk/drivers/mmc/host/Kconfig
@@ -142,7 +142,7 @@ config MMC_TIFM_SD
 
 config MMC_SPI
 	tristate "MMC/SD over SPI"
-	depends on MMC && SPI_MASTER && !HIGHMEM && HAS_DMA
+	depends on SPI_MASTER && !HIGHMEM && HAS_DMA
 	select CRC7
 	select CRC_ITU_T
 	help
@@ -155,7 +155,7 @@ config MMC_SPI
 
 config MMC_S3C
 	tristate "Samsung S3C SD/MMC Card Interface support"
-	depends on ARCH_S3C2410 && MMC
+	depends on ARCH_S3C2410
 	help
 	  This selects a driver for the MCI interface found in
           Samsung's S3C2410, S3C2412, S3C2440, S3C2442 CPUs.
@@ -166,7 +166,7 @@ config MMC_S3C
 
 config MMC_SDRICOH_CS
 	tristate "MMC/SD driver for Ricoh Bay1Controllers (EXPERIMENTAL)"
-	depends on EXPERIMENTAL && MMC && PCI && PCMCIA
+	depends on EXPERIMENTAL && PCI && PCMCIA
 	help
 	  Say Y here if your Notebook reports a Ricoh Bay1Controller PCMCIA
 	  card whenever you insert a MMC or SD card into the card slot.