[Gc-linux-cvs] linux/drivers/mmc/host Kconfig, 1.3, 1.4 Makefile, 1.3, 1.4

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/drivers/mmc/host
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/drivers/mmc/host

Modified Files:
	Kconfig Makefile 
Log Message:
Merge gc-linux-v2.6.31.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/mmc/host/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile	25 Oct 2009 18:56:56 -0000	1.3
--- Makefile	25 Oct 2009 18:59:28 -0000	1.4
***************
*** 17,20 ****
--- 17,21 ----
  obj-$(CONFIG_MMC_SDHCI_PLTFM)	+= sdhci-pltfm.o
  obj-$(CONFIG_MMC_SDHCI_S3C)	+= sdhci-s3c.o
+ obj-$(CONFIG_MMC_SDHCI_MIPC)	+= sdhci-mipc.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.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Kconfig	25 Oct 2009 18:56:56 -0000	1.3
--- Kconfig	25 Oct 2009 18:59:28 -0000	1.4
***************
*** 120,123 ****
--- 120,134 ----
  	  YMMV.
  
+ config MMC_SDHCI_MIPC
+ 	tristate "Nintendo Wii SDHCI support via 'mini'"
+ 	depends on MMC_SDHCI && STARLET_MINI
+ 	select MMC_SDHCI_IO_ACCESSORS
+ 	help
+ 	  This selects the Nintendo Wii Secure Digital Host Controller
+ 	  Interface. The SDHC hardware is accessed via the 'mini' firmware
+ 	  replacement for Starlet.
+ 
+ 	  If unsure, say N.
+ 
  config MMC_OMAP
  	tristate "TI OMAP Multimedia Card Interface support"