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
/
mxs_defconfig
diff --git
a/arch/arm/configs/mxs_defconfig
b/arch/arm/configs/mxs_defconfig
index 38480596c44983de48d7ff37ea7e274b4f1eaad5..ed570a0d1f2ac530e47e90e9d8cff21fad546b46 100644
(file)
--- a/
arch/arm/configs/mxs_defconfig
+++ b/
arch/arm/configs/mxs_defconfig
@@
-50,7
+50,7
@@
CONFIG_MTD_BLOCK=y
CONFIG_MTD_DATAFLASH=y
CONFIG_MTD_M25P80=y
CONFIG_MTD_SST25L=y
-CONFIG_MTD_NAND=y
+CONFIG_MTD_
RAW_
NAND=y
CONFIG_MTD_NAND_GPMI_NAND=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_UBI=y