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
/
at91_dt_defconfig
diff --git
a/arch/arm/configs/at91_dt_defconfig
b/arch/arm/configs/at91_dt_defconfig
index b7752929975ca77a5814e8a741fb46bc140be1e2..a88e314498800cbbaeea5a3d4969cf2b77519c93 100644
(file)
--- a/
arch/arm/configs/at91_dt_defconfig
+++ b/
arch/arm/configs/at91_dt_defconfig
@@
-55,7
+55,7
@@
CONFIG_MTD=y
CONFIG_MTD_CMDLINE_PARTS=y
CONFIG_MTD_BLOCK=y
CONFIG_MTD_DATAFLASH=y
-CONFIG_MTD_NAND=y
+CONFIG_MTD_
RAW_
NAND=y
CONFIG_MTD_NAND_ATMEL=y
CONFIG_MTD_UBI=y
CONFIG_MTD_UBI_GLUEBI=y