diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2011-06-01 19:05:06 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-06-09 15:01:40 +0200 |
| commit | 16f871bc30f86560017b9d34520593a28e08f373 (patch) | |
| tree | c025012cd51f7270607463d2daa507ca953aeffb /arch/x86/include/asm/time.h | |
| parent | 75bba0143454d0fef1b42d5b35cb5bd2f9388901 (diff) | |
| download | linux-16f871bc30f86560017b9d34520593a28e08f373.tar.bz2 | |
x86: i8253: Consolidate definitions of global_clock_event
There are multiple declarations of global_clock_event in header files
specific to particular clock event implementations. Consolidate them
in <asm/time.h> and make sure all users include that header.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Cc: Venkatesh Pallipadi (Venki) <venki@google.com>
Link: http://lkml.kernel.org/r/20110601180610.762763451@duck.linux-mips.net
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/include/asm/time.h')
| -rw-r--r-- | arch/x86/include/asm/time.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/include/asm/time.h b/arch/x86/include/asm/time.h index 7bdec4e9b739..92b8aec06970 100644 --- a/arch/x86/include/asm/time.h +++ b/arch/x86/include/asm/time.h @@ -1,10 +1,12 @@ #ifndef _ASM_X86_TIME_H #define _ASM_X86_TIME_H -extern void hpet_time_init(void); - +#include <linux/clocksource.h> #include <asm/mc146818rtc.h> +extern void hpet_time_init(void); extern void time_init(void); +extern struct clock_event_device *global_clock_event; + #endif /* _ASM_X86_TIME_H */ |