summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMasahiro Yamada <masahiroy@kernel.org>2024-02-21 23:01:45 +0900
committerMasahiro Yamada <masahiroy@kernel.org>2024-02-23 21:08:08 +0900
commitc31f96a00f652a96a1a097b0c6a333509560900f (patch)
tree9e9e804072e072d744c3093f17d0cc797e117ffe /arch
parent403198019890f2fdf8ad1cd2acb25a490e94da6b (diff)
downloadlinux-stable-c31f96a00f652a96a1a097b0c6a333509560900f.tar.gz
linux-stable-c31f96a00f652a96a1a097b0c6a333509560900f.tar.bz2
linux-stable-c31f96a00f652a96a1a097b0c6a333509560900f.zip
alpha: merge two entries for CONFIG_ALPHA_GAMMA
There are two entries for CONFIG_ALPHA_GAMMA, with the second one 7 lines below. Merge them together. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/alpha/Kconfig10
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 70e8343d00ba..fe5ae3aea999 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -390,16 +390,12 @@ config ALPHA_PRIMO
Say Y if you have an AS 1000 5/xxx or an AS 1000A 5/xxx.
config ALPHA_GAMMA
- bool "EV5 CPU(s) (model 5/xxx)?"
- depends on ALPHA_SABLE
+ bool "EV5 CPU(s) (model 5/xxx)?" if ALPHA_SABLE
+ depends on ALPHA_SABLE || ALPHA_LYNX
+ default ALPHA_LYNX
help
Say Y if you have an AS 2000 5/xxx or an AS 2100 5/xxx.
-config ALPHA_GAMMA
- bool
- depends on ALPHA_LYNX
- default y
-
config ALPHA_T2
bool
depends on ALPHA_SABLE || ALPHA_LYNX