1 files changed, 3 insertions, 11 deletions

diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index 29215f5f11b2..ca1238baef71 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -405,7 +405,7 @@ config CPU_V6
 config CPU_V6K
         bool "Support ARM V6K processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX
         select CPU_32v6
-        select CPU_32v6K if !ARCH_OMAP2
+        select CPU_32v6K
         select CPU_ABRT_EV6
         select CPU_PABRT_V6
         select CPU_CACHE_V6
@@ -418,7 +418,7 @@ config CPU_V6K
 # ARMv7
 config CPU_V7
         bool "Support ARM V7 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX
-        select CPU_32v6K if !ARCH_OMAP2
+        select CPU_32v6K
         select CPU_32v7
         select CPU_ABRT_EV7
         select CPU_PABRT_V7
@@ -461,15 +461,7 @@ config CPU_32v6
         select CPU_USE_DOMAINS if CPU_V6 && MMU
 
 config CPU_32v6K
-        bool "Support ARM V6K processor extensions" if !SMP
-        depends on CPU_V6 || CPU_V6K || CPU_V7
-        default y if SMP && !(ARCH_MX3 || ARCH_OMAP2)
-        help
-          Say Y here if your ARMv6 processor supports the 'K' extension.
-          This enables the kernel to use some instructions not present
-          on previous processors, and as such a kernel build with this
-          enabled will not boot on processors with do not support these
-          instructions.
+        bool
 
 config CPU_32v7
         bool