Commit 40319801 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

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: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent 223390b1

arch/alpha/Kconfig

+1 −4
Original line number Diff line number Diff line
@@ -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