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 'nand/for-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
imx_v6_v7_defconfig
diff --git
a/arch/arm/configs/imx_v6_v7_defconfig
b/arch/arm/configs/imx_v6_v7_defconfig
index 50fb01d70b1030ca6d2f721b30eaa8078894b589..8116648a8efd0240233f1df173e3a5cf51a24b8d 100644
(file)
--- a/
arch/arm/configs/imx_v6_v7_defconfig
+++ b/
arch/arm/configs/imx_v6_v7_defconfig
@@
-110,7
+110,7
@@
CONFIG_MTD_PHYSMAP_OF=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_NAND_VF610_NFC=y
CONFIG_MTD_NAND_MXC=y