git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
[pandora-kernel.git]
/
arch
/
arm
/
configs
/
sam9_l9260_defconfig
diff --git
a/arch/arm/configs/sam9_l9260_defconfig
b/arch/arm/configs/sam9_l9260_defconfig
index
8688362
..
1174e27
100644
(file)
--- a/
arch/arm/configs/sam9_l9260_defconfig
+++ b/
arch/arm/configs/sam9_l9260_defconfig
@@
-429,7
+429,7
@@
CONFIG_MTD_NAND=y
# CONFIG_MTD_NAND_MUSEUM_IDS is not set
CONFIG_MTD_NAND_IDS=y
# CONFIG_MTD_NAND_DISKONCHIP is not set
-CONFIG_MTD_NAND_AT
91
=y
+CONFIG_MTD_NAND_AT
MEL
=y
# CONFIG_MTD_NAND_NANDSIM is not set
CONFIG_MTD_NAND_PLATFORM=y
# CONFIG_MTD_ONENAND is not set