diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2006-04-04 17:10:34 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2006-04-04 17:10:34 -0400 |
commit | 12df7556705aae97f24a397377e17898700d7192 (patch) | |
tree | 5adc6b1c2aa940263ee2e88fc6645918533da539 /arch/arm/configs/at91rm9200ek_defconfig | |
parent | 34ddf733c415a8e336c996a4303d9f336e0c81b5 (diff) | |
parent | 6246b6128bbe34d0752f119cf7c5111c85fe481d (diff) |
Merge branch 'master'
Diffstat (limited to 'arch/arm/configs/at91rm9200ek_defconfig')
-rw-r--r-- | arch/arm/configs/at91rm9200ek_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/at91rm9200ek_defconfig b/arch/arm/configs/at91rm9200ek_defconfig index b7d934cdb1b7..6e0805a971d7 100644 --- a/arch/arm/configs/at91rm9200ek_defconfig +++ b/arch/arm/configs/at91rm9200ek_defconfig | |||
@@ -370,7 +370,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | |||
370 | # CONFIG_MTD_DOC2001 is not set | 370 | # CONFIG_MTD_DOC2001 is not set |
371 | # CONFIG_MTD_DOC2001PLUS is not set | 371 | # CONFIG_MTD_DOC2001PLUS is not set |
372 | CONFIG_MTD_AT91_DATAFLASH=y | 372 | CONFIG_MTD_AT91_DATAFLASH=y |
373 | CONFIG_MTD_AT91_DATAFLASH_CARD=y | 373 | # CONFIG_MTD_AT91_DATAFLASH_CARD is not set |
374 | 374 | ||
375 | # | 375 | # |
376 | # NAND Flash Device Drivers | 376 | # NAND Flash Device Drivers |