diff options
author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2012-10-11 12:12:15 +0200 |
---|---|---|
committer | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2012-10-11 12:12:15 +0200 |
commit | bb192755bebb965970883168fd8ef404d4053b8e (patch) | |
tree | ce7c0d807ea0d04022d32b8e0e438aa5441875b2 /target/linux/patches/3.6.1/mmc-host.patch | |
parent | 2a7f12012c92cc4d4bc475f07a788316f0e95030 (diff) | |
parent | 046cf475d64cb44460ac0aeb9e53032efd8185d0 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/linux/patches/3.6.1/mmc-host.patch')
-rw-r--r-- | target/linux/patches/3.6.1/mmc-host.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/target/linux/patches/3.6.1/mmc-host.patch b/target/linux/patches/3.6.1/mmc-host.patch new file mode 100644 index 000000000..3d0e37add --- /dev/null +++ b/target/linux/patches/3.6.1/mmc-host.patch @@ -0,0 +1,36 @@ +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 |