From: Tony Lindgren <tony@atomide.com>
Date: Wed, 25 May 2005 19:54:28 +0000 (-0700)
Subject: Merge with mainline
X-Git-Tag: v2.6.13-omap1~138
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=074fc72e60b2f6b2da70e24272cfc0c58c837f46;p=linux-2.6-omap-h63xx.git

Merge with mainline
---

074fc72e60b2f6b2da70e24272cfc0c58c837f46
diff --cc drivers/mmc/Kconfig
index 8141f9c32be,4991bbd054f..b094a95cc3a
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@@ -66,39 -49,9 +66,39 @@@ config MMC_PX
  
  	  If unsure, say N.
  
 +config MMC_OMAP
 +	tristate "TI OMAP Multimedia Card Interface support"
 +	depends on ARCH_OMAP && MMC
 +	select TPS65010 if MACH_OMAP_H2
 +	help
 +	  This selects the TI OMAP Multimedia card Interface.
 +	  If you have an OMAP board with a Multimedia Card slot,
 +	  say Y or M here.
 +
 +	  If unsure, say N.
 +
 +config MMC_OMAP16XX_BLOCK1
 +	boolean "First MMC block on OMAP16XX"
 +	depends on ARCH_OMAP16XX && MMC_OMAP
 +	default y if MACH_OMAP_H2 || MACH_OMAP_H3
 +	help
 +	  This enables the first of two MMC blocks on OMAP1610 multimedia
 +	  processor. You need to enable the correct block to activate your
 +	  MMC slot.
 +
 +config MMC_OMAP16XX_BLOCK2
 +	boolean "Second MMC block on OMAP16XX"
 +	depends on ARCH_OMAP16XX && MMC_OMAP
 +	default n if MACH_OMAP_H2 || MACH_OMAP_H3
 +	default y
 +	help
 +	  This enables the second of two MMC blocks on OMAP1610 multimedia
 +	  processor. You need to enable the correct block to activate your
 +	  MMC slot.
 +
  config MMC_WBSD
  	tristate "Winbond W83L51xD SD/MMC Card Interface support"
- 	depends on MMC && ISA && ISA_DMA_API
+ 	depends on MMC && ISA_DMA_API
  	help
  	  This selects the Winbond(R) W83L51xD Secure digital and
            Multimedia card Interface.