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 */