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
/
mvebu_v7_defconfig
diff --git
a/arch/arm/configs/mvebu_v7_defconfig
b/arch/arm/configs/mvebu_v7_defconfig
index 55140219ab110a88560e2bd3d259309e3fef0bde..48f7b4277b8ddd83dd2b24f465ac6438cefb6a69 100644
(file)
--- a/
arch/arm/configs/mvebu_v7_defconfig
+++ b/
arch/arm/configs/mvebu_v7_defconfig
@@
-52,7
+52,7
@@
CONFIG_MTD_CFI_AMDSTD=y
CONFIG_MTD_CFI_STAA=y
CONFIG_MTD_PHYSMAP_OF=y
CONFIG_MTD_M25P80=y
-CONFIG_MTD_NAND=y
+CONFIG_MTD_
RAW_
NAND=y
CONFIG_MTD_NAND_MARVELL=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_UBI=y