diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-06-02 11:39:11 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-06-02 11:39:11 -0400 |
| commit | 1c3f45ab2f7f879ea482501c83899505c31f7539 (patch) | |
| tree | 672465b3b9b3e2e26a8caf74ed64aa6885c52c13 /arch/x86_64/Kconfig | |
| parent | 4bcff1b37e7c3aed914d1ce5b45994adc7dbf455 (diff) | |
| parent | e0d6d71440a3a35c6fc2dde09f8e8d4d7bd44dda (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/x86_64/Kconfig')
| -rw-r--r-- | arch/x86_64/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig index 82cb2a3f127a..289f448ac89c 100644 --- a/arch/x86_64/Kconfig +++ b/arch/x86_64/Kconfig | |||
| @@ -305,6 +305,7 @@ config HPET_TIMER | |||
| 305 | 305 | ||
| 306 | config X86_PM_TIMER | 306 | config X86_PM_TIMER |
| 307 | bool "PM timer" | 307 | bool "PM timer" |
| 308 | depends on ACPI | ||
| 308 | default y | 309 | default y |
| 309 | help | 310 | help |
| 310 | Support the ACPI PM timer for time keeping. This is slow, | 311 | Support the ACPI PM timer for time keeping. This is slow, |
| @@ -421,7 +422,7 @@ config PCI_DIRECT | |||
| 421 | 422 | ||
| 422 | config PCI_MMCONFIG | 423 | config PCI_MMCONFIG |
| 423 | bool "Support mmconfig PCI config space access" | 424 | bool "Support mmconfig PCI config space access" |
| 424 | depends on PCI | 425 | depends on PCI && ACPI |
| 425 | select ACPI_BOOT | 426 | select ACPI_BOOT |
| 426 | 427 | ||
| 427 | config UNORDERED_IO | 428 | config UNORDERED_IO |