From: Andrew Lunn <andrew@lunn.ch>
Date: Sat, 22 Feb 2014 19:14:54 +0000 (+0100)
Subject: ARM: Fix default CPU selection for ARCH_MULTI_V5
X-Git-Tag: upstream/snapshot3+hdmi~3167
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e02098d84d67b8ff15defddcc7841bd3452a5e11;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

ARM: Fix default CPU selection for ARCH_MULTI_V5

commit 12567bbdee7ea553237085a2bbc0ffa5240f5248 upstream.

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")
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 1594945..44298ad 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)