diff options
| author | Masahiro Yamada <masahiroy@kernel.org> | 2024-02-21 23:01:44 +0900 |
|---|---|---|
| committer | Masahiro Yamada <masahiroy@kernel.org> | 2024-02-23 21:08:03 +0900 |
| commit | 403198019890f2fdf8ad1cd2acb25a490e94da6b (patch) | |
| tree | 52c10d7d3a58d1f09d374687208d69702c568cc4 /arch/alpha/Kconfig | |
| parent | 223390b1c4d266c3b684b99d0a1980c49ebccf0d (diff) | |
alpha: merge two entries for CONFIG_ALPHA_EV4
There are two entries for CONFIG_ALPHA_EV4, on line 337 and line 368.
Merge them together.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Diffstat (limited to 'arch/alpha/Kconfig')
| -rw-r--r-- | arch/alpha/Kconfig | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig index d6968d090d49..70e8343d00ba 100644 --- a/arch/alpha/Kconfig +++ b/arch/alpha/Kconfig @@ -338,6 +338,7 @@ config ALPHA_EV4 bool depends on ALPHA_JENSEN || (ALPHA_SABLE && !ALPHA_GAMMA) || ALPHA_LYNX || ALPHA_NORITAKE && !ALPHA_PRIMO || ALPHA_MIKASA && !ALPHA_PRIMO || ALPHA_CABRIOLET || ALPHA_AVANTI_CH || ALPHA_EB64P_CH || ALPHA_XL || ALPHA_NONAME || ALPHA_EB66 || ALPHA_EB66P || ALPHA_P2K default y if !ALPHA_LYNX + default y if !ALPHA_EV5 config ALPHA_LCA bool @@ -365,10 +366,6 @@ config ALPHA_EV5 bool "EV5 CPU(s) (model 5/xxx)?" if ALPHA_LYNX default y if ALPHA_RX164 || ALPHA_RAWHIDE || ALPHA_MIATA || ALPHA_LX164 || ALPHA_SX164 || ALPHA_RUFFIAN || ALPHA_SABLE && ALPHA_GAMMA || ALPHA_NORITAKE && ALPHA_PRIMO || ALPHA_MIKASA && ALPHA_PRIMO || ALPHA_PC164 || ALPHA_TAKARA || ALPHA_EB164 || ALPHA_ALCOR -config ALPHA_EV4 - bool - default y if ALPHA_LYNX && !ALPHA_EV5 - config ALPHA_CIA bool depends on ALPHA_MIATA || ALPHA_LX164 || ALPHA_SX164 || ALPHA_RUFFIAN || ALPHA_NORITAKE && ALPHA_PRIMO || ALPHA_MIKASA && ALPHA_PRIMO || ALPHA_PC164 || ALPHA_TAKARA || ALPHA_EB164 || ALPHA_ALCOR |