diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-09 10:43:49 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-09 10:43:49 +0200 |
| commit | 52e31f89cc40c613b22e62108fe12b27433a888e (patch) | |
| tree | c3cd45d6950706c32efdd341715e70b6ee6d7a5e /arch/x86/Kconfig | |
| parent | x86/asm/entry: Make thunk's restore a local label (diff) | |
| parent | Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/... (diff) | |
| download | linux-52e31f89cc40c613b22e62108fe12b27433a888e.tar.xz linux-52e31f89cc40c613b22e62108fe12b27433a888e.zip | |
Merge branch 'linus' into x86/asm, to pick up fixes before merging new changes
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 729d41d9ced3..df884a522c39 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2434,6 +2434,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) |