diff options
author | Andi Kleen <ak@suse.de> | 2006-02-03 15:50:44 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-04 19:43:12 -0500 |
commit | 226d780909f71bebfa4dfffa21493244aa22dfdc (patch) | |
tree | ae9f0ff1e2b62076585825379c3b859ad3f3a1af /include | |
parent | eddb6fb9a54cdc8c7c37e056a2b4bbbc8a128a36 (diff) |
[PATCH] x86_64: Define pmtmr_ioport to 0 when PM_TIMER is not available
Avoids some ifdef mess later.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-x86_64/proto.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-x86_64/proto.h b/include/asm-x86_64/proto.h index 115e496c6139..d35c7e06f340 100644 --- a/include/asm-x86_64/proto.h +++ b/include/asm-x86_64/proto.h | |||
@@ -42,7 +42,11 @@ extern void iommu_hole_init(void); | |||
42 | extern void time_init_gtod(void); | 42 | extern void time_init_gtod(void); |
43 | extern int pmtimer_mark_offset(void); | 43 | extern int pmtimer_mark_offset(void); |
44 | extern unsigned int do_gettimeoffset_pm(void); | 44 | extern unsigned int do_gettimeoffset_pm(void); |
45 | #ifdef CONFIG_X86_PM_TIMER | ||
45 | extern u32 pmtmr_ioport; | 46 | extern u32 pmtmr_ioport; |
47 | #else | ||
48 | #define pmtmr_ioport 0 | ||
49 | #endif | ||
46 | extern unsigned long long monotonic_base; | 50 | extern unsigned long long monotonic_base; |
47 | extern int sysctl_vsyscall; | 51 | extern int sysctl_vsyscall; |
48 | 52 | ||