Merge branch 'bugzilla-14483' into release

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

diff --git a/arch/arm/configs/omap_2430sdp_defconfig b/arch/arm/configs/omap_2430sdp_defconfig
index 640e9afc46303446db8424c038268886a1da691b..45b4ebae30567e98781251dcfad161efca7d6ea9 100644 (file)
--- a/arch/arm/configs/omap_2430sdp_defconfig
+++ b/arch/arm/configs/omap_2430sdp_defconfig
@@ -197,7 +197,6 @@ CONFIG_MACH_OMAP_2430SDP=y
 #
 # Processor Type
 #
-CONFIG_CPU_32=y
 CONFIG_CPU_V6=y
 # CONFIG_CPU_32v6K is not set
 CONFIG_CPU_32v6=y