git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'pci-for-jesse' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
yl9200_defconfig
diff --git
a/arch/arm/configs/yl9200_defconfig
b/arch/arm/configs/yl9200_defconfig
index 26de37f74686d3be37ad8f2b19f91480d953e699..a9f41c24c9dc2d05b7331b0e58c60aa596c90ebf 100644
(file)
--- a/
arch/arm/configs/yl9200_defconfig
+++ b/
arch/arm/configs/yl9200_defconfig
@@
-421,7
+421,7
@@
CONFIG_MTD_NAND=y
# CONFIG_MTD_NAND_ECC_SMC is not set
# CONFIG_MTD_NAND_MUSEUM_IDS is not set
CONFIG_MTD_NAND_IDS=y
-CONFIG_MTD_NAND_AT
91
=y
+CONFIG_MTD_NAND_AT
MEL
=y
# CONFIG_MTD_NAND_NANDSIM is not set
CONFIG_MTD_NAND_PLATFORM=y
# CONFIG_MTD_ALAUDA is not set