diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-08 15:45:45 +0100 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-08 15:45:45 +0100 |
commit | 364f6c717deef4a3ac4982e670fa9846b43cd060 (patch) | |
tree | 47e3967d6e2220130f2c070e300c97709143b28f /arch/x86_64/Kconfig | |
parent | 4ff4258a3e558814a3d48c50a59cd22f56bbea2f (diff) | |
parent | 1d6757fbff5bc86e94e59ab0d7bdd7e71351d839 (diff) | |
download | op-kernel-dev-364f6c717deef4a3ac4982e670fa9846b43cd060.zip op-kernel-dev-364f6c717deef4a3ac4982e670fa9846b43cd060.tar.gz |
Automatic merge with /usr/src/ntfs-2.6.git
Diffstat (limited to 'arch/x86_64/Kconfig')
-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 0f430d9..289f448 100644 --- a/arch/x86_64/Kconfig +++ b/arch/x86_64/Kconfig @@ -305,6 +305,7 @@ config HPET_TIMER config X86_PM_TIMER bool "PM timer" + depends on ACPI default y help Support the ACPI PM timer for time keeping. This is slow, |