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
/
ep93xx_defconfig
diff --git
a/arch/arm/configs/ep93xx_defconfig
b/arch/arm/configs/ep93xx_defconfig
index 78cd73d1c795bb6857ccefc9302dd409c6c9f93e..14889a785f07ca0423f59607f6e60b7235b5332f 100644
(file)
--- a/
arch/arm/configs/ep93xx_defconfig
+++ b/
arch/arm/configs/ep93xx_defconfig
@@
-63,7
+63,7
@@
CONFIG_MTD_CFI_AMDSTD=y
CONFIG_MTD_CFI_STAA=y
CONFIG_MTD_ROM=y
CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_NAND=y
+CONFIG_MTD_
RAW_
NAND=y
CONFIG_BLK_DEV_NBD=y
CONFIG_EEPROM_LEGACY=y
CONFIG_SCSI=y