Skip to content

Commit 4031980

Browse files
committed
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 <[email protected]>
1 parent 223390b commit 4031980

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

arch/alpha/Kconfig

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,7 @@ config ALPHA_EV4
338338
bool
339339
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
340340
default y if !ALPHA_LYNX
341+
default y if !ALPHA_EV5
341342

342343
config ALPHA_LCA
343344
bool
@@ -365,10 +366,6 @@ config ALPHA_EV5
365366
bool "EV5 CPU(s) (model 5/xxx)?" if ALPHA_LYNX
366367
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
367368

368-
config ALPHA_EV4
369-
bool
370-
default y if ALPHA_LYNX && !ALPHA_EV5
371-
372369
config ALPHA_CIA
373370
bool
374371
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

0 commit comments

Comments
 (0)