diff options
| author | Andrew Lunn <andrew@lunn.ch> | 2014-02-22 20:14:54 +0100 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-02-22 22:17:36 +0100 |
| commit | 12567bbdee7ea553237085a2bbc0ffa5240f5248 (patch) | |
| tree | f86fddbc8e161298d9e7727704155580306b3e96 | |
| parent | ARM: MM: Add DT binding for Feroceon L2 cache (diff) | |
| download | linux-12567bbdee7ea553237085a2bbc0ffa5240f5248.tar.xz linux-12567bbdee7ea553237085a2bbc0ffa5240f5248.zip | |
ARM: Fix default CPU selection for ARCH_MULTI_V5
CPU_ARM926T should be selected if no other CPU is. Put the ! in the
right place so this works.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Tested-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Fixes: 24e860fbfdb1c ("ARM: multiplatform: always pick one CPU type")
Cc: stable@vger.kernel.org # v3.11+
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
| -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) |