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
/
omap1_defconfig
diff --git
a/arch/arm/configs/omap1_defconfig
b/arch/arm/configs/omap1_defconfig
index 8448a7f407a4e1595664a95b8ba319d74eb6db29..82af77c093f16dd34dc924a1e2642e4e7a368591 100644
(file)
--- a/
arch/arm/configs/omap1_defconfig
+++ b/
arch/arm/configs/omap1_defconfig
@@
-89,7
+89,7
@@
CONFIG_MTD_CMDLINE_PARTS=y
CONFIG_MTD_BLOCK=y
CONFIG_MTD_CFI=y
CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_NAND=y
+CONFIG_MTD_
RAW_
NAND=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=2