diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2014-03-01 03:21:04 +0000 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-03-01 03:21:04 +0000 |
| commit | 0d75ab68fd1a516f7a394fac6ba0f0ef34bbd18e (patch) | |
| tree | 35e597b44cd1af328cb6b02e4f16de51ccd6f979 /arch/arm/Kconfig | |
| parent | aa89b0ad4f9cac3925bd8e85dbfc3c50ba7b31cf (diff) | |
| parent | b02b64384696ad13d6a827dc7775489d01b3dfd9 (diff) | |
| download | linux-next-0d75ab68fd1a516f7a394fac6ba0f0ef34bbd18e.tar.gz | |
Merge branch 'mvebu/soc-kw' into mvebu/soc
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index e25419817791..beba369d74de 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -898,7 +898,7 @@ config ARCH_MULTI_V5 bool "ARMv5 based platforms (ARM926T, XSCALE, PJ1, ...)" depends on !ARCH_MULTI_V6_V7 select ARCH_MULTI_V4_V5 - select CPU_ARM926T if (!CPU_ARM946E || CPU_ARM1020 || \ + select CPU_ARM926T if !(CPU_ARM946E || CPU_ARM1020 || \ CPU_ARM1020E || CPU_ARM1022 || CPU_ARM1026 || \ CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_FEROCEON) |