From: Arnd Bergmann Date: Fri, 20 Apr 2012 17:37:58 +0000 (+0000) Subject: ARM: spear6xx: remove board selection options X-Git-Tag: v3.5-rc1~155^2 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=74c437532b8b5db53509963ec38e8424c56ff6f4;p=linux.git ARM: spear6xx: remove board selection options There are no board specific configurations that need user intervention, so just make MACH_SPEAR600 the silent default for ARCH_SPEAR6XX to prevent users from turning it off, which would result in a build error. Signed-off-by: Arnd Bergmann Reported-by: Paul Gortmaker Acked-by: Viresh Kumar --- diff --git a/arch/arm/mach-spear6xx/Kconfig b/arch/arm/mach-spear6xx/Kconfig index fbe298bd1d92..339f397dea70 100644 --- a/arch/arm/mach-spear6xx/Kconfig +++ b/arch/arm/mach-spear6xx/Kconfig @@ -2,21 +2,9 @@ # SPEAr6XX Machine configuration file # -if ARCH_SPEAR6XX - -menu "SPEAr6xx Implementations" -config BOARD_SPEAR600_DT - bool "SPEAr600 generic board configured via device-tree" - select MACH_SPEAR600 +config MACH_SPEAR600 + def_bool y + depends on ARCH_SPEAR6XX select USE_OF help Supports ST SPEAr600 boards configured via the device-tree - -endmenu - -config MACH_SPEAR600 - bool "SPEAr600" - help - Supports ST SPEAr600 Machine - -endif #ARCH_SPEAR6XX