From 1506c9b6eea8502355e84584887e29e2e5f70f9d Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 30 Jan 2008 13:30:02 +0100
Subject: [PATCH] --- yaml --- r: 79695 b: refs/heads/master c:
 df619e6bafeb8e129aba3173d384544d7fa6e3c2 h: refs/heads/master i:   79693:
 47e9224cc71461b9de8d7af2e4059719bb410294   79691:
 460a2f8519a52db11be27d9ac62933558394e0e0   79687:
 b6ef6898f44b17fe000e19b9fc7038d5663f82fe   79679:
 8cb61a47267e80ef335bde3698d08d2c057fa17c v: v3

---
 [refs]                       | 2 +-
 trunk/include/asm-x86/hpet.h | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9a5367b86fe5..cf535d251148 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ada5cba6a0318f90e45b38557e7b5206a9cba38
+refs/heads/master: df619e6bafeb8e129aba3173d384544d7fa6e3c2
diff --git a/trunk/include/asm-x86/hpet.h b/trunk/include/asm-x86/hpet.h
index ad8d6e758785..624f600f7161 100644
--- a/trunk/include/asm-x86/hpet.h
+++ b/trunk/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 */