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/x86_64 | |
| 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/x86_64')
| -rw-r--r-- | arch/x86_64/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig index 80c38c5d71fe..44ee7f6acf7b 100644 --- a/arch/x86_64/Kconfig +++ b/arch/x86_64/Kconfig | |||
| @@ -379,6 +379,11 @@ config GENERIC_IRQ_PROBE | |||
| 379 | bool | 379 | bool |
| 380 | default y | 380 | default y |
| 381 | 381 | ||
| 382 | # we have no ISA slots, but we do have ISA-style DMA. | ||
| 383 | config ISA_DMA_API | ||
| 384 | bool | ||
| 385 | default y | ||
| 386 | |||
| 382 | menu "Power management options" | 387 | menu "Power management options" |
| 383 | 388 | ||
| 384 | source kernel/power/Kconfig | 389 | source kernel/power/Kconfig |