diff options
| -rw-r--r-- | arch/arm/mm/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index baf638487a2d..4c2e90dc549c 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
| @@ -399,7 +399,7 @@ config CPU_V6 | |||
| 399 | config CPU_32v6K | 399 | config CPU_32v6K |
| 400 | bool "Support ARM V6K processor extensions" if !SMP | 400 | bool "Support ARM V6K processor extensions" if !SMP |
| 401 | depends on CPU_V6 | 401 | depends on CPU_V6 |
| 402 | default y if SMP && !ARCH_MX3 | 402 | default y if SMP && !(ARCH_MX3 || ARCH_OMAP2) |
| 403 | help | 403 | help |
| 404 | Say Y here if your ARMv6 processor supports the 'K' extension. | 404 | Say Y here if your ARMv6 processor supports the 'K' extension. |
| 405 | This enables the kernel to use some instructions not present | 405 | This enables the kernel to use some instructions not present |
| @@ -410,7 +410,7 @@ config CPU_32v6K | |||
| 410 | # ARMv7 | 410 | # ARMv7 |
| 411 | config CPU_V7 | 411 | config CPU_V7 |
| 412 | bool "Support ARM V7 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX | 412 | bool "Support ARM V7 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX |
| 413 | select CPU_32v6K | 413 | select CPU_32v6K if !ARCH_OMAP2 |
| 414 | select CPU_32v7 | 414 | select CPU_32v7 |
| 415 | select CPU_ABRT_EV7 | 415 | select CPU_ABRT_EV7 |
| 416 | select CPU_PABRT_V7 | 416 | select CPU_PABRT_V7 |