| 123456789101112131415161718192021222324252627282930313233343536 | diff -Nur linux-2.6.39-rc6.orig/drivers/mmc/host/Kconfig linux-2.6.39-rc6/drivers/mmc/host/Kconfig--- linux-2.6.39-rc6.orig/drivers/mmc/host/Kconfig	2011-05-04 04:59:13.000000000 +0200+++ linux-2.6.39-rc6/drivers/mmc/host/Kconfig	2011-05-10 23:39:01.000000000 +0200@@ -253,13 +253,6 @@  	  If unsure, say N. -choice-	prompt "Atmel SD/MMC Driver"-	depends on AVR32 || ARCH_AT91-	default MMC_ATMELMCI if AVR32-	help-	  Choose which driver to use for the Atmel MCI Silicon- config MMC_AT91 	tristate "AT91 SD/MMC Card Interface support" 	depends on ARCH_AT91@@ -268,18 +261,6 @@  	  If unsure, say N. -config MMC_ATMELMCI-	tristate "Atmel Multimedia Card Interface support"-	depends on AVR32 || ARCH_AT91-	help-	  This selects the Atmel Multimedia Card Interface driver. If-	  you have an AT32 (AVR32) or AT91 platform with a Multimedia-	  Card slot, say Y or M here.--	  If unsure, say N.--endchoice- config MMC_ATMELMCI_DMA 	bool "Atmel MCI DMA support (EXPERIMENTAL)" 	depends on MMC_ATMELMCI && (AVR32 || ARCH_AT91SAM9G45) && DMA_ENGINE && EXPERIMENTAL
 |