]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] x86_64: Define pmtmr_ioport to 0 when PM_TIMER is not available
authorAndi Kleen <ak@suse.de>
Fri, 3 Feb 2006 20:50:44 +0000 (21:50 +0100)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 5 Feb 2006 00:43:12 +0000 (16:43 -0800)
Avoids some ifdef mess later.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
include/asm-x86_64/proto.h

index 115e496c613951bd0ebd5667e18c075e76d5bf60..d35c7e06f3401ee7813b44fa6583e70cd7458e61 100644 (file)
@@ -42,7 +42,11 @@ extern void iommu_hole_init(void);
 extern void time_init_gtod(void);
 extern int pmtimer_mark_offset(void);
 extern unsigned int do_gettimeoffset_pm(void);
+#ifdef CONFIG_X86_PM_TIMER
 extern u32 pmtmr_ioport;
+#else
+#define pmtmr_ioport 0
+#endif
 extern unsigned long long monotonic_base;
 extern int sysctl_vsyscall;