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
/
cm_x2xx_defconfig
diff --git
a/arch/arm/configs/cm_x2xx_defconfig
b/arch/arm/configs/cm_x2xx_defconfig
index fb45b4983d3cfd7a22eaf6082d624faf252e3e7f..5344434df6520d7d8d6d7275f7f3257f4daf2177 100644
(file)
--- a/
arch/arm/configs/cm_x2xx_defconfig
+++ b/
arch/arm/configs/cm_x2xx_defconfig
@@
-58,7
+58,7
@@
CONFIG_MTD_CFI_AMDSTD=y
CONFIG_MTD_CFI_STAA=y
CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_PXA2XX=y
-CONFIG_MTD_NAND=y
+CONFIG_MTD_
RAW_
NAND=y
CONFIG_MTD_NAND_GPIO=m
CONFIG_MTD_NAND_CM_X270=y
CONFIG_MTD_NAND_PLATFORM=y