aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2013-03-04 18:19:19 -0500
committerArnd Bergmann <arnd@arndb.de>2013-03-15 06:37:42 -0400
commit8dda05ccd8a227e2b56ce6b26d52b1af88437f9e (patch)
tree5bc368e7884dc931baf116335878e52f53d0e49d /arch/arm/Kconfig
parent04cf1440c0fbb320ddea00ef878c7b53c7b7298c (diff)
ARM: Scorpion is a v7 architecture, not v6
Scorpion processors have always been v7 CPUs. Fix the Kconfig text to reflect this. Reported-by: Stepan Moskovchenko <stepanm@codeaurora.org> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 9c87fd8ed9eb..ca1b6fd94a3f 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1005,12 +1005,12 @@ config ARCH_MULTI_V4_V5
1005 bool 1005 bool
1006 1006
1007config ARCH_MULTI_V6 1007config ARCH_MULTI_V6
1008 bool "ARMv6 based platforms (ARM11, Scorpion, ...)" 1008 bool "ARMv6 based platforms (ARM11)"
1009 select ARCH_MULTI_V6_V7 1009 select ARCH_MULTI_V6_V7
1010 select CPU_V6 1010 select CPU_V6
1011 1011
1012config ARCH_MULTI_V7 1012config ARCH_MULTI_V7
1013 bool "ARMv7 based platforms (Cortex-A, PJ4, Krait)" 1013 bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)"
1014 default y 1014 default y
1015 select ARCH_MULTI_V6_V7 1015 select ARCH_MULTI_V6_V7
1016 select ARCH_VEXPRESS 1016 select ARCH_VEXPRESS