Update of /cvsroot/gc-linux/linux/drivers/mmc/host
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22540/drivers/mmc/host
Modified Files:
Kconfig Makefile
Log Message:
Merge v2.6.32.
Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/mmc/host/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile 9 Dec 2009 18:40:10 -0000 1.6
--- Makefile 9 Dec 2009 18:44:55 -0000 1.7
***************
*** 17,20 ****
--- 17,21 ----
obj-$(CONFIG_MMC_SDHCI_PLTFM) += sdhci-pltfm.o
obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o
+ obj-$(CONFIG_MMC_SDHCI_HLWD) += sdhci-hlwd.o
obj-$(CONFIG_MMC_WBSD) += wbsd.o
obj-$(CONFIG_MMC_AU1X) += au1xmmc.o
Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/mmc/host/Kconfig,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Kconfig 9 Dec 2009 18:40:09 -0000 1.6
--- Kconfig 9 Dec 2009 18:44:55 -0000 1.7
***************
*** 120,123 ****
--- 120,133 ----
YMMV.
+ config MMC_SDHCI_HLWD
+ tristate "Nintendo Wii (Hollywood) SDHCI support"
+ depends on MMC_SDHCI && STARLET_MINI
+ select MMC_SDHCI_IO_ACCESSORS
+ help
+ This selects the Nintendo Wii Secure Digital Host Controller
+ Interface contained in the Hollywood chipset.
+
+ If unsure, say N.
+
config MMC_OMAP
tristate "TI OMAP Multimedia Card Interface support"
|
