Merge remote branch 'linus/master' into x86/bootmem

[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 733b851e5b7e233ca40febf54f4550caa1cfc801..82ca6c80d6af7838f02b3bc9673b8f3a38d050c4 100644 (file)
--- a/arch/arm/configs/pxa3xx_defconfig
+++ b/arch/arm/configs/pxa3xx_defconfig
@@ -240,7 +240,6 @@ CONFIG_PLAT_PXA=y
 #
 # Processor Type
 #
-CONFIG_CPU_32=y
 CONFIG_CPU_XSC3=y
 CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y