Merge branch 'mxc-audio' into for-2.6.34

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

diff --git a/arch/arm/configs/omap_ldp_defconfig b/arch/arm/configs/omap_ldp_defconfig
index 9139532c3be7ec11a82dbba631b64e2459e0eaf7..0efb4b044fff045a24315b63184085a382138003 100644 (file)
--- a/arch/arm/configs/omap_ldp_defconfig
+++ b/arch/arm/configs/omap_ldp_defconfig
@@ -214,7 +214,6 @@ CONFIG_MACH_OMAP_LDP=y
 #
 # Processor Type
 #
-CONFIG_CPU_32=y
 CONFIG_CPU_32v6K=y
 CONFIG_CPU_V7=y
 CONFIG_CPU_32v7=y