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 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
pxa3xx_defconfig
diff --git
a/arch/arm/configs/pxa3xx_defconfig
b/arch/arm/configs/pxa3xx_defconfig
index bfea6874b0a1b4003fdd8903c30d3db2d9078d00..3e0de035ab7725fb742b9f47806c474ae7d87868 100644
(file)
--- a/
arch/arm/configs/pxa3xx_defconfig
+++ b/
arch/arm/configs/pxa3xx_defconfig
@@
-32,8
+32,7
@@
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_MTD=y
CONFIG_MTD_BLOCK=y
CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_PXA3xx=y
-CONFIG_MTD_NAND_PXA3xx_BUILTIN=y
+CONFIG_MTD_NAND_MARVELL=y
CONFIG_MTD_ONENAND=y
CONFIG_MTD_ONENAND_VERIFY_WRITE=y
CONFIG_MTD_ONENAND_GENERIC=y