Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville...

[mv-sheeva.git] / arch / arm / configs / h5000_defconfig

diff --git a/arch/arm/configs/h5000_defconfig b/arch/arm/configs/h5000_defconfig
index 649baa37049543aa5e8abc7902a45f5b632fe7db..5bb73728fad6c184e9fd70472351808a76232335 100644 (file)
--- a/arch/arm/configs/h5000_defconfig
+++ b/arch/arm/configs/h5000_defconfig
@@ -206,7 +206,6 @@ CONFIG_PXA25x=y
 #
 # Processor Type
 #
-CONFIG_CPU_32=y
 CONFIG_CPU_XSCALE=y
 CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y