diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-05 08:59:37 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-05 08:59:37 -0400 |
| commit | bfd4bda097f8758d28e632ff2035e25577f6b060 (patch) | |
| tree | 022276b3625a432c7132e39776e7e448445087ac /arch/i386 | |
| parent | 488f2eaca1b0831a5a5e6a66e33bad2cdeff7238 (diff) | |
| parent | b2d84f078a8be40f5ae3b4d2ac001e2a7f45fe4f (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/i386')
| -rw-r--r-- | arch/i386/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index 99b4f294a52d..fee589119606 100644 --- a/arch/i386/Kconfig +++ b/arch/i386/Kconfig | |||
| @@ -1173,6 +1173,10 @@ source "drivers/pci/pcie/Kconfig" | |||
| 1173 | 1173 | ||
| 1174 | source "drivers/pci/Kconfig" | 1174 | source "drivers/pci/Kconfig" |
| 1175 | 1175 | ||
| 1176 | config ISA_DMA_API | ||
| 1177 | bool | ||
| 1178 | default y | ||
| 1179 | |||
| 1176 | config ISA | 1180 | config ISA |
| 1177 | bool "ISA support" | 1181 | bool "ISA support" |
| 1178 | depends on !(X86_VOYAGER || X86_VISWS) | 1182 | depends on !(X86_VOYAGER || X86_VISWS) |