From: Arnd Bergmann Date: Wed, 26 Feb 2014 16:39:12 +0000 (+0100) Subject: ARM: rpc: autoselect CPU_SA110 X-Git-Tag: v3.15-rc1~81^2~8^2~20 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=fa04e209aeb251bebfe6a7a5966a3d5bbd5c13b5;p=~emulex%2Finfiniband.git ARM: rpc: autoselect CPU_SA110 ARCH_RPC no longer supports other CPUs aside from StrongARM110, so we can make the option implicitly selected by the platform and no longer give the option of building a kernel without CPU support. Signed-off-by: Arnd Bergmann Cc: Russell King --- diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f18f8b84851..2d93211c687 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -698,6 +698,7 @@ config ARCH_RPC select ARCH_MAY_HAVE_PC_FDC select ARCH_SPARSEMEM_ENABLE select ARCH_USES_GETTIMEOFFSET + select CPU_SA110 select FIQ select HAVE_IDE select HAVE_PATA_PLATFORM diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index 1f8fed94c2a..9e832295eca 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@ -264,7 +264,7 @@ config CPU_ARM1026 # SA110 config CPU_SA110 - bool "Support StrongARM(R) SA-110 processor" if ARCH_RPC + bool select CPU_32v3 if ARCH_RPC select CPU_32v4 if !ARCH_RPC select CPU_ABRT_EV4