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 tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
keystone_defconfig
diff --git
a/arch/arm/configs/keystone_defconfig
b/arch/arm/configs/keystone_defconfig
index 3ded35a07f45a00173c51d987a733c14033c3df3..72fee57aad2fa204d5a38034c467bf482905a36d 100644
(file)
--- a/
arch/arm/configs/keystone_defconfig
+++ b/
arch/arm/configs/keystone_defconfig
@@
-124,7
+124,7
@@
CONFIG_MTD_CMDLINE_PARTS=y
CONFIG_MTD_BLOCK=y
CONFIG_MTD_PLATRAM=y
CONFIG_MTD_M25P80=y
-CONFIG_MTD_NAND=y
+CONFIG_MTD_
RAW_
NAND=y
CONFIG_MTD_NAND_DAVINCI=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_UBI=y