Merge tag 'for-linus-20130509' of git://git.infradead.org/linux-mtd

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / arm / mach-pxa / Kconfig

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 86eec4159cbc95eb4da78cb7fe8bd2769f19890f..96100dbf5a2e8353e9fad34ded41ec5e83dda7ad 100644 (file)
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -51,11 +51,13 @@ config MACH_LITTLETON
 config MACH_TAVOREVB
        bool "PXA930 Evaluation Board (aka TavorEVB)"
        select CPU_PXA930
+       select CPU_PXA935
        select PXA3xx
 
 config MACH_SAAR
        bool "PXA930 Handheld Platform (aka SAAR)"
        select CPU_PXA930
+       select CPU_PXA935
        select PXA3xx
 
 comment "Third Party Dev Platforms (sorted by vendor name)"
@@ -160,7 +162,6 @@ config MACH_XCEP
        select MTD
        select MTD_CFI
        select MTD_CFI_INTELEXT
-       select MTD_CHAR
        select MTD_PHYSMAP
        select PXA25x
        select SMC91X