diff options
| author | Stephen Boyd | 2013-03-05 00:19:19 +0100 |
|---|---|---|
| committer | Arnd Bergmann | 2013-03-15 11:37:42 +0100 |
| commit | 8dda05ccd8a227e2b56ce6b26d52b1af88437f9e (patch) | |
| tree | 5bc368e7884dc931baf116335878e52f53d0e49d /arch/arm | |
| parent | Merge branch 'armsoc/fix' of git://github.com/hzhuang1/linux into fixes (diff) | |
| download | kernel-qcow2-linux-8dda05ccd8a227e2b56ce6b26d52b1af88437f9e.tar.gz kernel-qcow2-linux-8dda05ccd8a227e2b56ce6b26d52b1af88437f9e.tar.xz kernel-qcow2-linux-8dda05ccd8a227e2b56ce6b26d52b1af88437f9e.zip | |
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')
| -rw-r--r-- | arch/arm/Kconfig | 4 |
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 bool config ARCH_MULTI_V6 - bool "ARMv6 based platforms (ARM11, Scorpion, ...)" + bool "ARMv6 based platforms (ARM11)" select ARCH_MULTI_V6_V7 select CPU_V6 config ARCH_MULTI_V7 - bool "ARMv7 based platforms (Cortex-A, PJ4, Krait)" + bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)" default y select ARCH_MULTI_V6_V7 select ARCH_VEXPRESS |