From: Tony Lindgren <tony@atomide.com>
Date: Fri, 7 Apr 2006 20:42:31 +0000 (-0700)
Subject: Manual merge with mainline
X-Git-Tag: v2.6.17-omap1~101^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3870564b37989d1fe95cf746a63413403f27792f;p=linux-2.6-omap-h63xx.git

Manual merge with mainline

As noted by Komal Shah
---

diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index da8ce352773..003b077c232 100644
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -29,23 +29,6 @@ config MMC_BLOCK
 	  mount the filesystem. Almost everyone wishing MMC support
 	  should say Y or M here.
 
-config MMC_BLOCK_BROKEN_RFD
-	boolean "Write work-around for incompatible cards"
-	depends on MMC_BLOCK
-	default n
-	help
-	  Say y here if your MMC card fails write operations. Some cards
-	  lie about being ready to receive data while they actually are not.
-
-config MMC_BULKTRANSFER
-	bool "Multi-block writes (EXPERIMENTAL)"
-	depends on MMC_BLOCK != n && EXPERIMENTAL
-	default n
-	help
-	  By default all writes are done one sector at a time. Enable
-	  this option to transfer as large blocks as the host supports.
-	  The transfer speed is in most cases doubled.
-
 config MMC_ARMMMCI
 	tristate "ARM AMBA Multimedia Card Interface support"
 	depends on ARM_AMBA && MMC
@@ -66,6 +49,17 @@ config MMC_PXA
 
 	  If unsure, say N.
 
+config MMC_SDHCI
+	tristate "Secure Digital Host Controller Interface support  (EXPERIMENTAL)"
+	depends on PCI && MMC && EXPERIMENTAL
+	help
+	  This select the generic Secure Digital Host Controller Interface.
+	  It is used by manufacturers such as Texas Instruments(R), Ricoh(R)
+	  and Toshiba(R). Most controllers found in laptops are of this type.
+	  If you have a controller with this interface, say Y or M here.
+
+	  If unsure, say N.
+
 config MMC_OMAP
 	tristate "TI OMAP Multimedia Card Interface support"
 	depends on ARCH_OMAP && MMC
@@ -97,4 +91,22 @@ config MMC_AU1X
 
 	  If unsure, say N.
 
+config MMC_AT91RM9200
+	tristate "AT91RM9200 SD/MMC Card Interface support"
+	depends on ARCH_AT91RM9200 && MMC
+	help
+	  This selects the AT91RM9200 MCI controller.
+
+	  If unsure, say N.
+
+config MMC_IMX
+	tristate "Motorola i.MX Multimedia Card Interface support"
+	depends on ARCH_IMX && MMC
+	help
+	  This selects the Motorola i.MX Multimedia card Interface.
+	  If you have a i.MX platform with a Multimedia Card slot,
+	  say Y or M here.
+
+	  If unsure, say N.
+
 endmenu
diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile
index 27cbef71ffc..d2957e35cc6 100644
--- a/drivers/mmc/Makefile
+++ b/drivers/mmc/Makefile
@@ -17,8 +17,15 @@ obj-$(CONFIG_MMC_BLOCK)		+= mmc_block.o
 #
 obj-$(CONFIG_MMC_ARMMMCI)	+= mmci.o
 obj-$(CONFIG_MMC_PXA)		+= pxamci.o
+obj-$(CONFIG_MMC_IMX)		+= imxmmc.o
+obj-$(CONFIG_MMC_SDHCI)		+= sdhci.o
 obj-$(CONFIG_MMC_WBSD)		+= wbsd.o
 obj-$(CONFIG_MMC_AU1X)		+= au1xmmc.o
 obj-$(CONFIG_MMC_OMAP)		+= omap.o
+obj-$(CONFIG_MMC_AT91RM9200)	+= at91_mci.o
 
 mmc_core-y := mmc.o mmc_queue.o mmc_sysfs.o
+
+ifeq ($(CONFIG_MMC_DEBUG),y)
+EXTRA_CFLAGS += -DDEBUG
+endif