summaryrefslogtreecommitdiff
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-07-08 17:27:47 +0200
committerIngo Molnar <mingo@kernel.org>2016-07-08 17:27:47 +0200
commit9e7f7f5425e6d1492109a537ee88c99b29580655 (patch)
tree81f9d68abb5b793aadaf80bd6940af04e3c16eb9 /arch/x86/Kconfig
parent6daa2ec0b3e3808c55329d12de3c157cf38b17b0 (diff)
parentf80fd3a5fff88a9ace7e8cd11d07cf874a63ea9f (diff)
Merge branch 'x86/mm' into x86/boot, to pick up dependencies
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig9
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 770ae5259dff..930fe88095d3 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2444,6 +2444,15 @@ config PCI_CNB20LE_QUIRK
source "drivers/pci/Kconfig"
+config ISA_BUS
+ bool "ISA-style bus support on modern systems" if EXPERT
+ select ISA_BUS_API
+ help
+ Enables ISA-style drivers on modern systems. This is necessary to
+ support PC/104 devices on X86_64 platforms.
+
+ If unsure, say N.
+
# x86_64 have no ISA slots, but can have ISA-style DMA.
config ISA_DMA_API
bool "ISA-style DMA support" if (X86_64 && EXPERT)