From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 30 Jan 2008 12:30:02 +0000 (+0100)
Subject: x86: offer is_hpet_enabled() on !CONFIG_HPET_TIMER too
X-Git-Tag: v2.6.25-rc1~1143^2~880
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=df619e6bafeb8e129aba3173d384544d7fa6e3c2;p=linux-2.6-omap-h63xx.git

x86: offer is_hpet_enabled() on !CONFIG_HPET_TIMER too

offer is_hpet_enabled() on !CONFIG_HPET_TIMER too.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

diff --git a/include/asm-x86/hpet.h b/include/asm-x86/hpet.h
index ad8d6e75878..624f600f716 100644
--- a/include/asm-x86/hpet.h
+++ b/include/asm-x86/hpet.h
@@ -80,10 +80,11 @@ extern irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id);
 
 #endif /* CONFIG_HPET_EMULATE_RTC */
 
-#else
+#else /* CONFIG_HPET_TIMER */
 
 static inline int hpet_enable(void) { return 0; }
 static inline unsigned long hpet_readl(unsigned long a) { return 0; }
+static inline int is_hpet_enabled(void) { return 0; }
 
-#endif /* CONFIG_HPET_TIMER */
+#endif
 #endif /* ASM_X86_HPET_H */