diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-06-27 09:35:02 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-06-27 09:35:02 (GMT) |
commit | 630741fb60ac4e286f5396403c0d864d924c02bc (patch) | |
tree | 16eb952c3653386c6d1ad99e369615dfe65e4d67 /arch/x86/Kconfig | |
parent | 807e5b80687c06715d62df51a5473b231e3e8b15 (diff) | |
parent | ea1dc6fc6242f991656e35e2ed3d90ec1cd13418 (diff) | |
download | linux-630741fb60ac4e286f5396403c0d864d924c02bc.tar.xz |
Merge branch 'sched/urgent' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 0a7b885..d9a94da 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2439,6 +2439,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) |