diff options
| author | Andi Kleen <ak@suse.de> | 2005-05-31 17:39:26 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-31 17:54:17 -0400 |
| commit | 9c2be6a0fa186e2cb0cf14f41f20b08a5809a026 (patch) | |
| tree | be2ec5c930b79825eff6d61f758bd54dd582ec8e /arch/x86_64 | |
| parent | 8d91640606c47551771a9b27664f249f4b176613 (diff) | |
[PATCH] x86_64 CONFIG_ACPI=n build fix
Make CONFIG_X86_PM_TIMER dependent on CONFIG_ACPI
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/x86_64')
| -rw-r--r-- | arch/x86_64/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig index 0f430d9d3632..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, |