summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/apb_timer.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2011-06-01 19:05:06 +0100
committerThomas Gleixner <tglx@linutronix.de>2011-06-09 15:01:40 +0200
commit16f871bc30f86560017b9d34520593a28e08f373 (patch)
treec025012cd51f7270607463d2daa507ca953aeffb /arch/x86/kernel/apb_timer.c
parent75bba0143454d0fef1b42d5b35cb5bd2f9388901 (diff)
downloadlinux-stable-16f871bc30f86560017b9d34520593a28e08f373.tar.gz
linux-stable-16f871bc30f86560017b9d34520593a28e08f373.tar.bz2
linux-stable-16f871bc30f86560017b9d34520593a28e08f373.zip
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/kernel/apb_timer.c')
-rw-r--r--arch/x86/kernel/apb_timer.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/apb_timer.c b/arch/x86/kernel/apb_timer.c
index 289e92862fd9..2b6630d75e17 100644
--- a/arch/x86/kernel/apb_timer.c
+++ b/arch/x86/kernel/apb_timer.c
@@ -44,6 +44,7 @@
#include <asm/fixmap.h>
#include <asm/apb_timer.h>
#include <asm/mrst.h>
+#include <asm/time.h>
#define APBT_MASK CLOCKSOURCE_MASK(32)
#define APBT_SHIFT 22