From: Andi Kleen <ak@suse.de>
Date: Fri, 3 Feb 2006 20:50:44 +0000 (+0100)
Subject: [PATCH] x86_64: Define pmtmr_ioport to 0 when PM_TIMER is not available
X-Git-Tag: v2.6.16-rc3~201
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=226d780909f71bebfa4dfffa21493244aa22dfdc;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/include/asm-x86_64/proto.h b/include/asm-x86_64/proto.h
index 115e496c613..d35c7e06f34 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);
 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;