summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorWilliam Breathitt Gray <vilhelm.gray@gmail.com>2016-05-01 23:50:29 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-05-02 05:21:02 +0200
commit8ac0fba2da41620f4931a1007c71b0d4723eb02a (patch)
tree6d73238c9e25bd9bc118f68d2f72620e40d43e11 /arch
parentdriver-core: use 'dev' argument in dev_dbg_ratelimited stub (diff)
downloadlinux-8ac0fba2da41620f4931a1007c71b0d4723eb02a.tar.xz
linux-8ac0fba2da41620f4931a1007c71b0d4723eb02a.zip
isa: Decouple X86_32 dependency from the ISA Kconfig option
The introduction of the ISA_BUS option blocks the compilation of ISA drivers on non-x86 platforms. The ISA_BUS configuration option should not be necessary if the X86_32 dependency can be decoupled from the ISA configuration option. This patch both removes the ISA_BUS configuration option entirely and removes the X86_32 dependency from the ISA configuration option. Acked-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/Kconfig10
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index a5977986f38b..280e5ebae2f5 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2472,16 +2472,8 @@ config ISA_DMA_API
Enables ISA-style DMA support for devices requiring such controllers.
If unsure, say Y.
-config ISA_BUS
- bool "ISA bus support"
- help
- Enables ISA bus support for devices requiring such controllers.
-
-if X86_32
-
config ISA
bool "ISA support"
- depends on ISA_BUS
---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
@@ -2489,6 +2481,8 @@ 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.
+if X86_32
+
config EISA
bool "EISA support"
depends on ISA