commit 486bcc59f3083c54df7b67d1d69db81585632a8b
author Andrew Victor <andrew@sanpeople.com> Sun Apr 02 17:15:49 2006 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Sun Apr 02 17:15:49 2006 +0100
tree 639b70d41a0b9d47e43b6bedd8a70cb4e5d6845f
parent cc2832a1313340ff1de55f15fac5b7fe48fa2a72

[ARM] 3395/2: AT91RM9200 Dataflash Card vs MMC selection

Patch from Andrew Victor

On the Atmel AT91RM9200-DK and -EK boards, a pin is used to control
whether the card socket is used for a DataFlash Card or an MMC/SD card.

We now default to MMC/SD in the configuration files.

(This version of the patch can be applied before Patch 3392/1)

Signed-off-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

arch/arm/configs/at91rm9200dk_defconfig

diff --git a/arch/arm/configs/at91rm9200dk_defconfig b/arch/arm/configs/at91rm9200dk_defconfig
index 1fe73d1..9e1c1cc 100644
--- a/arch/arm/configs/at91rm9200dk_defconfig
+++ b/arch/arm/configs/at91rm9200dk_defconfig
@@ -379,7 +379,7 @@
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
 CONFIG_MTD_AT91_DATAFLASH=y
-CONFIG_MTD_AT91_DATAFLASH_CARD=y
+# CONFIG_MTD_AT91_DATAFLASH_CARD is not set
 
 #
 # NAND Flash Device Drivers