Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6630a8e5 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Masahiro Yamada
Browse files

eisa: consolidate EISA Kconfig entry in drivers/eisa 



Let architectures opt into EISA support by selecting HAVE_EISA and
handle everything else in drivers/eisa.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarPaul Burton <paul.burton@mips.com>
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent 1753d50c

arch/alpha/Kconfig

+8 −7
Original line number Diff line number Diff line
@@ -129,11 +129,13 @@ choice 
config ALPHA_GENERIC

	bool "Generic"

	depends on TTY

	select HAVE_EISA

	help

	  A generic kernel will run on all supported Alpha hardware.



config ALPHA_ALCOR

	bool "Alcor/Alpha-XLT"

	select HAVE_EISA

	help

	  For systems using the Digital ALCOR chipset: 5 chips (4, 64-bit data

	  slices (Data Switch, DSW) - 208-pin PQFP and 1 control (Control, I/O
@@ -207,6 +209,7 @@ config ALPHA_JENSEN 
	bool "Jensen"

	depends on BROKEN

	select DMA_DIRECT_OPS

	select HAVE_EISA

	help

	  DEC PC 150 AXP (aka Jensen): This is a very old Digital system - one

	  of the first-generation Alpha systems. A number of these systems
@@ -223,6 +226,7 @@ config ALPHA_LX164 


config ALPHA_LYNX

	bool "Lynx"

	select HAVE_EISA

	help

	  AlphaServer 2100A-based systems.
@@ -233,6 +237,7 @@ config ALPHA_MARVEL 


config ALPHA_MIATA

	bool "Miata"

	select HAVE_EISA

	help

	  The Digital PersonalWorkStation (PWS 433a, 433au, 500a, 500au, 600a,

	  or 600au).
@@ -252,6 +257,7 @@ config ALPHA_NONAME_CH 


config ALPHA_NORITAKE

	bool "Noritake"

	select HAVE_EISA

	help

	  AlphaServer 1000A, AlphaServer 600A, and AlphaServer 800-based

	  systems.
@@ -264,6 +270,7 @@ config ALPHA_P2K 


config ALPHA_RAWHIDE

	bool "Rawhide"

	select HAVE_EISA

	help

	  AlphaServer 1200, AlphaServer 4000 and AlphaServer 4100 machines.

	  See HOWTO at
@@ -283,6 +290,7 @@ config ALPHA_SX164 


config ALPHA_SABLE

	bool "Sable"

	select HAVE_EISA

	help

	  Digital AlphaServer 2000 and 2100-based systems.
@@ -512,11 +520,6 @@ config ALPHA_SRM 


	  If unsure, say N.



config EISA

	bool

	depends on ALPHA_GENERIC || ALPHA_JENSEN || ALPHA_ALCOR || ALPHA_MIKASA || ALPHA_SABLE || ALPHA_LYNX || ALPHA_NORITAKE || ALPHA_RAWHIDE

	default y



config ARCH_MAY_HAVE_PC_FDC

	def_bool y
@@ -667,8 +670,6 @@ config HZ 
	default 1200 if HZ_1200

	default 1024



source "drivers/eisa/Kconfig"



config SRM_ENV

	tristate "SRM environment through procfs"

	depends on PROC_FS

arch/arm/Kconfig

+0 −15
Original line number Diff line number Diff line
@@ -161,21 +161,6 @@ config HAVE_PROC_CPU 
config NO_IOPORT_MAP

	bool



config EISA

	bool

	---help---

	  The Extended Industry Standard Architecture (EISA) bus was

	  developed as an open alternative to the IBM MicroChannel bus.



	  The EISA bus provided some of the features of the IBM MicroChannel

	  bus while maintaining backward compatibility with cards made for

	  the older ISA bus.  The EISA bus saw limited use between 1988 and

	  1995 when it was made obsolete by the PCI bus.



	  Say Y here if you are building a kernel for an EISA-based machine.



	  Otherwise, say N.



config SBUS

	bool

arch/mips/Kconfig

+5 −26
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ config MIPS 
	select GENERIC_IOMAP

	select GENERIC_IRQ_PROBE

	select GENERIC_IRQ_SHOW

	select GENERIC_ISA_DMA if EISA

	select GENERIC_LIB_ASHLDI3

	select GENERIC_LIB_ASHRDI3

	select GENERIC_LIB_CMPDI2
@@ -71,6 +72,7 @@ config MIPS 
	select HAVE_SYSCALL_TRACEPOINTS

	select HAVE_VIRT_CPU_ACCOUNTING_GEN if 64BIT || !SMP

	select IRQ_FORCED_THREADING

	select ISA if EISA

	select MODULES_USE_ELF_RELA if MODULES && 64BIT

	select MODULES_USE_ELF_REL if MODULES

	select PERF_USE_VMALLOC
@@ -632,7 +634,7 @@ config SGI_IP22 
	select CSRC_R4K

	select DEFAULT_SGI_PARTITION

	select DMA_NONCOHERENT

	select HW_HAS_EISA

	select HAVE_EISA

	select I8253

	select I8259

	select IP22_CPU_SCACHE
@@ -697,7 +699,7 @@ config SGI_IP28 
	select DMA_NONCOHERENT

	select GENERIC_ISA_DMA_SUPPORT_BROKEN

	select IRQ_MIPS_CPU

	select HW_HAS_EISA

	select HAVE_EISA

	select I8253

	select I8259

	select SGI_HAS_I8042
@@ -840,8 +842,8 @@ config SNI_RM 
	select DEFAULT_SGI_PARTITION if CPU_BIG_ENDIAN

	select DMA_NONCOHERENT

	select GENERIC_ISA_DMA

	select HAVE_EISA

	select HAVE_PCSPKR_PLATFORM

	select HW_HAS_EISA

	select HAVE_PCI

	select IRQ_MIPS_CPU

	select I8253
@@ -3024,9 +3026,6 @@ config MIPS_AUTO_PFN_OFFSET 


menu "Bus options (PCI, PCMCIA, EISA, ISA, TC)"



config HW_HAS_EISA

	bool



config PCI_DRIVERS_GENERIC

	select PCI_DOMAINS_GENERIC if PCI

	bool
@@ -3044,26 +3043,6 @@ config PCI_DRIVERS_LEGACY 
config ISA

	bool



config EISA

	bool "EISA support"

	depends on HW_HAS_EISA

	select ISA

	select GENERIC_ISA_DMA

	---help---

	  The Extended Industry Standard Architecture (EISA) bus was

	  developed as an open alternative to the IBM MicroChannel bus.



	  The EISA bus provided some of the features of the IBM MicroChannel

	  bus while maintaining backward compatibility with cards made for

	  the older ISA bus.  The EISA bus saw limited use between 1988 and

	  1995 when it was made obsolete by the PCI bus.



	  Say Y here if you are building a kernel for an EISA-based machine.



	  Otherwise, say N.



source "drivers/eisa/Kconfig"



config TC

	bool "TURBOchannel support"

	depends on MACH_DECSTATION

arch/powerpc/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -886,9 +886,6 @@ config PPC_INDIRECT_PCI 
	depends on PCI

	default y if 40x || 44x



config EISA

	bool



config SBUS

	bool

arch/x86/Kconfig

+1 −18
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ config X86 
	select HAVE_DYNAMIC_FTRACE_WITH_REGS

	select HAVE_EBPF_JIT

	select HAVE_EFFICIENT_UNALIGNED_ACCESS

	select HAVE_EISA

	select HAVE_EXIT_THREAD

	select HAVE_FENTRY			if X86_64 || DYNAMIC_FTRACE

	select HAVE_FTRACE_MCOUNT_RECORD
@@ -2682,24 +2683,6 @@ config ISA 
	  (MCA) or VESA.  ISA is an older system, now being displaced by PCI;

	  newer boards don't support it.  If you have ISA, say Y, otherwise N.



config EISA

	bool "EISA support"

	depends on ISA

	---help---

	  The Extended Industry Standard Architecture (EISA) bus was

	  developed as an open alternative to the IBM MicroChannel bus.



	  The EISA bus provided some of the features of the IBM MicroChannel

	  bus while maintaining backward compatibility with cards made for

	  the older ISA bus.  The EISA bus saw limited use between 1988 and

	  1995 when it was made obsolete by the PCI bus.



	  Say Y here if you are building a kernel for an EISA-based machine.



	  Otherwise, say N.



source "drivers/eisa/Kconfig"



config SCx200

	tristate "NatSemi SCx200 support"

	---help---