Merge branch 'for-airlied' of git://git.freedesktop.org/git/nouveau/linux-2.6 into...

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

diff --git a/arch/arm/configs/ixp23xx_defconfig b/arch/arm/configs/ixp23xx_defconfig
index ef97561ed75b642fdec7a72acf5dbd12f7cbc83f..59c11c93180f6457adbefebf7b9db167a5b91bd8 100644 (file)
--- a/arch/arm/configs/ixp23xx_defconfig
+++ b/arch/arm/configs/ixp23xx_defconfig
@@ -145,7 +145,6 @@ CONFIG_MACH_ROADRUNNER=y
 #
 # Processor Type
 #
-CONFIG_CPU_32=y
 CONFIG_CPU_XSC3=y
 CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y