---

yaml --- r: 79695 b: refs/heads/master c: df619e6 h: refs/heads/master i: 79693: 47e9224 79691: 460a2f8 79687: b6ef689 79679: 8cb61a4 v: v3
git-mirror · Jan 30, 2008 · 1506c9b · 1506c9b
1 parent 72a745e
commit 1506c9b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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 */