Commit 46652b10 authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds

[PATCH] x86_64 hpet: fix function warning

put function prototype outside of #ifdef block, to fix:
arch/x86_64/kernel/time.c:941: warning: implicit declaration of
function `oem_force_hpet_timer'
Signed-off-by: default avatarRandy Dunlap <rddunlap@osdl.org>
Cc: <ak@muc.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9b5dfd3d
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
extern int is_hpet_enabled(void); extern int is_hpet_enabled(void);
extern int hpet_rtc_timer_init(void); extern int hpet_rtc_timer_init(void);
extern int oem_force_hpet_timer(void);
#ifdef CONFIG_HPET_EMULATE_RTC #ifdef CONFIG_HPET_EMULATE_RTC
extern int hpet_mask_rtc_irq_bit(unsigned long bit_mask); extern int hpet_mask_rtc_irq_bit(unsigned long bit_mask);
...@@ -54,7 +55,6 @@ extern int hpet_set_alarm_time(unsigned char hrs, unsigned char min, unsigned ch ...@@ -54,7 +55,6 @@ extern int hpet_set_alarm_time(unsigned char hrs, unsigned char min, unsigned ch
extern int hpet_set_periodic_freq(unsigned long freq); extern int hpet_set_periodic_freq(unsigned long freq);
extern int hpet_rtc_dropped_irq(void); extern int hpet_rtc_dropped_irq(void);
extern int hpet_rtc_timer_init(void); extern int hpet_rtc_timer_init(void);
extern int oem_force_hpet_timer(void);
#endif /* CONFIG_HPET_EMULATE_RTC */ #endif /* CONFIG_HPET_EMULATE_RTC */
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment