Remove SBUS/MCA/EISA/etc from architectures that don't have them
Subsystems (7)
PATCH 1/1 Remove SBUS/MCA/EISA/etc from architectures that don't have them
This seems like something left over from the migration to Kconfig. It's kind of confusing when you grep for SBUS and find out that umpteen different architectures think they need to mention it ;-) While I was killing off SBUS, I thought I might as well get rid of MCA and EISA while I was at it.
This should probably go in through each arch maintainers tree.
Signed-off-by Matthew Wilcox <[email protected]>
arch/arm/Kconfig +0 -26
@@ -41,32 +41,6 @@ config NO_IOPORT bool default n -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 - -config MCA - bool - help - MicroChannel Architecture is found in some IBM PS/2 machines and - laptops. It is a bus system similar to PCI or ISA. See - <file:Documentation/mca.txt> (and especially the web page given - there) before attempting to build an MCA bus kernel. - config GENERIC_HARDIRQS bool default y
arch/i386/Kconfig +0 -3
@@ -63,9 +63,6 @@ config QUICKLIST bool default y -config SBUS - bool - config GENERIC_ISA_DMA bool default y
arch/m32r/Kconfig +2 -6
@@ -9,9 +9,6 @@ config M32R bool default y -config SBUS - bool - config GENERIC_ISA_DMA bool default y
@@ -322,7 +319,7 @@ config BOOT_IOREMAP endmenu -menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)" +menu "Bus options (PCI, PCMCIA, ISA)" config PCI bool "PCI support"
@@ -331,8 +328,7 @@ config PCI help Find out whether you have a PCI motherboard. PCI is the name of a bus system, i.e. the way the CPU talks to the other stuff inside - your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or - VESA. If you have PCI, say Y, otherwise N. + your box. If you have PCI, say Y, otherwise N. The PCI-HOWTO, available from <http://www.linuxdoc.org/docs.html#howto>, contains valuable
arch/m68k/Kconfig +0 -23
@@ -58,29 +58,6 @@ source "init/Kconfig" menu "Platform dependent setup" -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 MCA - bool - help - MicroChannel Architecture is found in some IBM PS/2 machines and - laptops. It is a bus system similar to PCI or ISA. See - <file:Documentation/mca.txt> (and especially the web page given - there) before attempting to build an MCA bus kernel. - config PCMCIA tristate ---help---
arch/m68knommu/Kconfig +1 -1
@@ -656,7 +656,7 @@ config ISA_DMA_API depends on !M5272 default y -menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)" +menu "Bus options (PCI, PCMCIA, ISA)" config PCI bool "PCI support"
arch/powerpc/Kconfig +0 -6
@@ -411,12 +411,6 @@ config PPC_INDIRECT_PCI default y if 40x || 44x default n -config EISA - bool - -config SBUS - bool - config FSL_SOC bool
arch/ppc/Kconfig +0 -9
@@ -1212,15 +1212,6 @@ config PPC_INDIRECT_PCI default y if 40x || 44x || 85xx || 83xx || PPC_PREP default n -config EISA - bool - help - The Extended Industry Standard Architecture (EISA) bus is a bus - architecture used on some older intel-based PCs. - -config SBUS - bool - # Yes MCA RS/6000s exist but Linux-PPC does not currently support any config MCA bool
arch/sh/Kconfig +1 -28
@@ -638,36 +638,9 @@ config ISA help Find out whether you have ISA slots on your motherboard. ISA is the name of a bus system, i.e. the way the CPU talks to the other stuff - inside your box. Other bus systems are PCI, EISA, MicroChannel - (MCA) or VESA. ISA is an older system, now being displaced by PCI; + inside your box. 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 - ---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 MCA - bool - help - MicroChannel Architecture is found in some IBM PS/2 machines and - laptops. It is a bus system similar to PCI or ISA. See - <file:Documentation/mca.txt> (and especially the web page given - there) before attempting to build an MCA bus kernel. - -config SBUS - bool - config SUPERHYWAY tristate "SuperHyway Bus support" depends on CPU_SUBTYPE_SH4_202
arch/sh64/Kconfig +2 -9
@@ -229,21 +229,14 @@ source "mm/Kconfig" endmenu -menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)" - -config ISA - bool - -config SBUS - bool +menu "Bus options (PCI, PCMCIA)" config PCI bool "PCI support" help Find out whether you have a PCI motherboard. PCI is the name of a bus system, i.e. the way the CPU talks to the other stuff inside - your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or - VESA. If you have PCI, say Y, otherwise N. + your box. If you have PCI, say Y, otherwise N. The PCI-HOWTO, available from <http://www.tldp.org/docs.html#howto>, contains valuable
arch/um/Kconfig +0 -12
@@ -21,18 +21,6 @@ config NO_IOMEM mainmenu "Linux/Usermode Kernel Configuration" -config ISA - bool - -config SBUS - bool - -config PCI - bool - -config PCMCIA - bool - # Yet to do! config TRACE_IRQFLAGS_SUPPORT bool
arch/v850/Kconfig +1 -16
@@ -53,21 +53,6 @@ config ARCH_HAS_ILOG2_U64 bool default n -# Turn off some random 386 crap that can affect device config -config ISA - bool - default n -config ISAPNP - bool - default n -config EISA - bool - default n -config MCA - bool - default n - - ############################################################################# #### v850-specific config
@@ -251,7 +236,7 @@ source init/Kconfig ############################################################################# -menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)" +menu "Bus options (PCI, PCMCIA)" # config PCI # bool "PCI support"
arch/x86_64/Kconfig +0 -12
@@ -68,12 +68,6 @@ config NR_QUICK int default 2 -config ISA - bool - -config SBUS - bool - config RWSEM_GENERIC_SPINLOCK bool default y
@@ -269,12 +263,6 @@ config X86_HT config MATH_EMULATION bool -config MCA - bool - -config EISA - bool - config X86_IO_APIC bool default y
arch/xtensa/Kconfig +1 -2
@@ -171,8 +171,7 @@ config PCI help Find out whether you have a PCI motherboard. PCI is the name of a bus system, i.e. the way the CPU talks to the other stuff inside - your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or - VESA. If you have PCI, say Y, otherwise N. + your box. If you have PCI, say Y, otherwise N. The PCI-HOWTO, available from <http://www.linuxdoc.org/docs.html#howto>, contains valuable
Signature · 3 lines
"Bill, look, we understand that you're interested in selling us this operating system, but compare it to ours. We can't possibly take such a retrograde step."