Merge branch 'for-2.6.33' of git://linux-nfs.org/~bfields/linux

[sfrench/cifs-2.6.git] / arch / arm / configs / colibri_pxa270_defconfig

diff --git a/arch/arm/configs/colibri_pxa270_defconfig b/arch/arm/configs/colibri_pxa270_defconfig
index 4cf3bde1c522c3c5b14dd7b380d9fec2966c9990..c962870b3f856e711c75e248d3a35e10df0192a7 100644 (file)
--- a/arch/arm/configs/colibri_pxa270_defconfig
+++ b/arch/arm/configs/colibri_pxa270_defconfig
@@ -204,7 +204,6 @@ CONFIG_PXA27x=y
 #
 # Processor Type
 #
-CONFIG_CPU_32=y
 CONFIG_CPU_XSCALE=y
 CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y