summaryrefslogtreecommitdiff
path: root/arch/x86_64/kernel/time.c
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2005-05-31 21:39:26 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-31 21:54:17 (GMT)
commit8d91640606c47551771a9b27664f249f4b176613 (patch)
tree7db8df064328970f80227d45692ff285f7d8d44f /arch/x86_64/kernel/time.c
parent2e3e80c2b75e3815a0160cbd23d4fdb767d66b35 (diff)
downloadlinux-fsl-qoriq-8d91640606c47551771a9b27664f249f4b176613.tar.xz
[PATCH] x86_64: More fixes for compilation without CONFIG_ACPI
Suggested by Alexander Nyberg 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/kernel/time.c')
-rw-r--r--arch/x86_64/kernel/time.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c
index 735b676..fb8c809 100644
--- a/arch/x86_64/kernel/time.c
+++ b/arch/x86_64/kernel/time.c
@@ -27,7 +27,9 @@
#include <linux/bcd.h>
#include <linux/kallsyms.h>
#include <linux/acpi.h>
+#ifdef CONFIG_ACPI
#include <acpi/achware.h> /* for PM timer frequency */
+#endif
#include <asm/8253pit.h>
#include <asm/pgtable.h>
#include <asm/vsyscall.h>