summaryrefslogtreecommitdiffstats
path: root/arch/arm/mm/Kconfig
diff options
context:
space:
mode:
authorCatalin Marinas2010-09-01 15:33:29 +0200
committerRussell King2010-09-02 16:32:13 +0200
commit026b5ca3b65f878019a8eb0c7a702cd5c20a4104 (patch)
treefbab114954b4134635af3b93f5fcddd6e32ce025 /arch/arm/mm/Kconfig
parentMerge branch 'imx-for-2.6.36' of git://git.pengutronix.de/git/imx/linux-2.6 (diff)
downloadkernel-qcow2-linux-026b5ca3b65f878019a8eb0c7a702cd5c20a4104.tar.gz
kernel-qcow2-linux-026b5ca3b65f878019a8eb0c7a702cd5c20a4104.tar.xz
kernel-qcow2-linux-026b5ca3b65f878019a8eb0c7a702cd5c20a4104.zip
ARM: 6344/1: Mark CPU_32v6K as depended on CPU_V7
CPU_32v6K is selected by CPU_V7 but it only depends on CPU_V6. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm/Kconfig')
-rw-r--r--arch/arm/mm/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index 33c3f570aaa0..a0a2928ae4dd 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -398,7 +398,7 @@ config CPU_V6
# ARMv6k
config CPU_32v6K
bool "Support ARM V6K processor extensions" if !SMP
- depends on CPU_V6
+ depends on CPU_V6 || CPU_V7
default y if SMP && !(ARCH_MX3 || ARCH_OMAP2)
help
Say Y here if your ARMv6 processor supports the 'K' extension.