aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86/hpet.h
diff options
context:
space:
mode:
authorChris Wright <chrisw@sous-sol.org>2007-10-12 17:04:23 -0400
committerThomas Gleixner <tglx@inhelltoy.tec.linutronix.de>2007-10-12 17:04:23 -0400
commit31c435d75e7d15a5f965c5eb0e33fe0e236f49a4 (patch)
tree800c8fe9722e34bfbf3ba52c2393b22264ba4bed /include/asm-x86/hpet.h
parent39d0b7ba7b9c0a2c594073400cde1d0beffa0bea (diff)
i386/x8664: cleanup the shared hpet code
Remove hpet_readl/writel from vsyscall.h, where it does not belong anyway. Use the hpet code itself. Signed-off-by: Chris Wright <chrisw@sous-sol.org> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Diffstat (limited to 'include/asm-x86/hpet.h')
-rw-r--r--include/asm-x86/hpet.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-x86/hpet.h b/include/asm-x86/hpet.h
index e2976ed30b70..64446a9577dc 100644
--- a/include/asm-x86/hpet.h
+++ b/include/asm-x86/hpet.h
@@ -65,6 +65,7 @@
65extern unsigned long hpet_address; 65extern unsigned long hpet_address;
66extern int is_hpet_enabled(void); 66extern int is_hpet_enabled(void);
67extern int hpet_enable(void); 67extern int hpet_enable(void);
68extern unsigned long hpet_readl(unsigned long a);
68 69
69#ifdef CONFIG_HPET_EMULATE_RTC 70#ifdef CONFIG_HPET_EMULATE_RTC
70 71
@@ -84,6 +85,7 @@ extern irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id);
84#else 85#else
85 86
86static inline int hpet_enable(void) { return 0; } 87static inline int hpet_enable(void) { return 0; }
88static inline unsigned long hpet_readl(unsigned long a) { return 0; }
87 89
88#endif /* CONFIG_HPET_TIMER */ 90#endif /* CONFIG_HPET_TIMER */
89#endif /* ASM_X86_HPET_H */ 91#endif /* ASM_X86_HPET_H */