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

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

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

Modified Files:
	Kconfig Makefile 
Log Message:
Forward to v2.6.31.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/mmc/host/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile	25 Oct 2009 18:53:45 -0000	1.2
--- Makefile	25 Oct 2009 18:56:56 -0000	1.3
***************
*** 15,18 ****
--- 15,20 ----
  obj-$(CONFIG_MMC_RICOH_MMC)	+= ricoh_mmc.o
  obj-$(CONFIG_MMC_SDHCI_OF)	+= sdhci-of.o
+ obj-$(CONFIG_MMC_SDHCI_PLTFM)	+= sdhci-pltfm.o
+ obj-$(CONFIG_MMC_SDHCI_S3C)	+= sdhci-s3c.o
  obj-$(CONFIG_MMC_WBSD)		+= wbsd.o
  obj-$(CONFIG_MMC_AU1X)		+= au1xmmc.o
***************
*** 30,32 ****
--- 32,39 ----
  obj-$(CONFIG_MMC_SDRICOH_CS)	+= sdricoh_cs.o
  obj-$(CONFIG_MMC_TMIO)		+= tmio_mmc.o
+ obj-$(CONFIG_MMC_CB710)	+= cb710-mmc.o
+ obj-$(CONFIG_MMC_VIA_SDMMC)	+= via-sdmmc.o
  
+ ifeq ($(CONFIG_CB710_DEBUG),y)
+ 	CFLAGS-cb710-mmc	+= -DDEBUG
+ endif

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/mmc/host/Kconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Kconfig	25 Oct 2009 18:53:45 -0000	1.2
--- Kconfig	25 Oct 2009 18:56:56 -0000	1.3
***************
*** 84,87 ****
--- 84,123 ----
  	  If unsure, say N.
  
+ config MMC_SDHCI_PLTFM
+ 	tristate "SDHCI support on the platform specific bus"
+ 	depends on MMC_SDHCI
+ 	help
+ 	  This selects the platform specific bus support for Secure Digital Host
+ 	  Controller Interface.
+ 
+ 	  If you have a controller with this interface, say Y or M here.
+ 
+ 	  If unsure, say N.
+ 
+ config MMC_SDHCI_S3C
+ 	tristate "SDHCI support on Samsung S3C SoC"
+ 	depends on MMC_SDHCI && (PLAT_S3C24XX || PLAT_S3C64XX)
+ 	help
+ 	  This selects the Secure Digital Host Controller Interface (SDHCI)
+ 	  often referrered to as the HSMMC block in some of the Samsung S3C
+ 	  range of SoC.
+ 
+ 	  Note, due to the problems with DMA, the DMA support is only
+ 	  available with CONFIG_EXPERIMENTAL is selected.
+ 
+ 	  If you have a controller with this interface, say Y or M here.
+ 
+ 	  If unsure, say N.
+ 
+ config MMC_SDHCI_S3C_DMA
+ 	bool "DMA support on S3C SDHCI"
+ 	depends on MMC_SDHCI_S3C && EXPERIMENTAL
+ 	help
+ 	  Enable DMA support on the Samsung S3C SDHCI glue. The DMA
+ 	  has proved to be problematic if the controller encounters
+ 	  certain errors, and thus should be treated with care.
+ 
+ 	  YMMV.
+ 
  config MMC_OMAP
  	tristate "TI OMAP Multimedia Card Interface support"
***************
*** 156,160 ****
  config MMC_IMX
  	tristate "Motorola i.MX Multimedia Card Interface support"
! 	depends on ARCH_IMX
  	help
  	  This selects the Motorola i.MX Multimedia card Interface.
--- 192,196 ----
  config MMC_IMX
  	tristate "Motorola i.MX Multimedia Card Interface support"
! 	depends on ARCH_MX1
  	help
  	  This selects the Motorola i.MX Multimedia card Interface.
***************
*** 238,243 ****
  config MMC_TMIO
  	tristate "Toshiba Mobile IO Controller (TMIO) MMC/SD function support"
! 	depends on MFD_TMIO
  	help
  	  This provides support for the SD/MMC cell found in TC6393XB,
! 	  T7L66XB and also ipaq ASIC3
--- 274,303 ----
  config MMC_TMIO
  	tristate "Toshiba Mobile IO Controller (TMIO) MMC/SD function support"
! 	depends on MFD_TMIO || MFD_ASIC3
  	help
  	  This provides support for the SD/MMC cell found in TC6393XB,
! 	  T7L66XB and also HTC ASIC3
! 
! config MMC_CB710
! 	tristate "ENE CB710 MMC/SD Interface support"
! 	depends on PCI
! 	select CB710_CORE
! 	help
! 	  This option enables support for MMC/SD part of ENE CB710/720 Flash
! 	  memory card reader found in some laptops (ie. some versions of
! 	  HP Compaq nx9500).
! 
! 	  This driver can also be built as a module. If so, the module
! 	  will be called cb710-mmc.
! 
! config MMC_VIA_SDMMC
! 	tristate "VIA SD/MMC Card Reader Driver"
! 	depends on PCI
! 	help
! 	  This selects the VIA SD/MMC Card Reader driver, say Y or M here.
! 	  VIA provides one multi-functional card reader which integrated into
! 	  some motherboards manufactured by VIA. This card reader supports
! 	  SD/MMC/SDHC.
! 	  If you have a controller with this interface, say Y or M here.
! 
! 	  If unsure, say N.