From ed8273c09745aa47a68d3226d39206375a8a4c44 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Wed, 1 Jun 2011 19:05:06 +0100
Subject: [PATCH] --- yaml --- r: 257189 b: refs/heads/master c:
 16f871bc30f86560017b9d34520593a28e08f373 h: refs/heads/master i:   257187:
 0de8ec1b8b61377123b1945414a327674e8f282e v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/x86/include/asm/apb_timer.h | 1 -
 trunk/arch/x86/include/asm/i8253.h     | 2 --
 trunk/arch/x86/include/asm/time.h      | 6 ++++--
 trunk/arch/x86/kernel/apb_timer.c      | 1 +
 trunk/arch/x86/kernel/apic/apic.c      | 1 +
 trunk/arch/x86/kernel/hpet.c           | 1 +
 trunk/arch/x86/kernel/i8253.c          | 1 +
 8 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index b9949ce7bcff..303f4b829bdb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75bba0143454d0fef1b42d5b35cb5bd2f9388901
+refs/heads/master: 16f871bc30f86560017b9d34520593a28e08f373
diff --git a/trunk/arch/x86/include/asm/apb_timer.h b/trunk/arch/x86/include/asm/apb_timer.h
index 2fefa501d3ba..963f7d487781 100644
--- a/trunk/arch/x86/include/asm/apb_timer.h
+++ b/trunk/arch/x86/include/asm/apb_timer.h
@@ -50,7 +50,6 @@
 #define APBT_DEV_USED  1
 
 extern void apbt_time_init(void);
-extern struct clock_event_device *global_clock_event;
 extern unsigned long apbt_quick_calibrate(void);
 extern int arch_setup_apbt_irqs(int irq, int trigger, int mask, int cpu);
 extern void apbt_setup_secondary_clock(void);
diff --git a/trunk/arch/x86/include/asm/i8253.h b/trunk/arch/x86/include/asm/i8253.h
index 20480cef7547..3d5f5eea5da4 100644
--- a/trunk/arch/x86/include/asm/i8253.h
+++ b/trunk/arch/x86/include/asm/i8253.h
@@ -3,8 +3,6 @@
 
 #define PIT_LATCH	LATCH
 
-extern struct clock_event_device *global_clock_event;
-
 extern void setup_pit_timer(void);
 
 #endif /* _ASM_X86_I8253_H */
diff --git a/trunk/arch/x86/include/asm/time.h b/trunk/arch/x86/include/asm/time.h
index 7bdec4e9b739..92b8aec06970 100644
--- a/trunk/arch/x86/include/asm/time.h
+++ b/trunk/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 */
diff --git a/trunk/arch/x86/kernel/apb_timer.c b/trunk/arch/x86/kernel/apb_timer.c
index 289e92862fd9..2b6630d75e17 100644
--- a/trunk/arch/x86/kernel/apb_timer.c
+++ b/trunk/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
diff --git a/trunk/arch/x86/kernel/apic/apic.c b/trunk/arch/x86/kernel/apic/apic.c
index f3c37841bb33..9da0dc02bea4 100644
--- a/trunk/arch/x86/kernel/apic/apic.c
+++ b/trunk/arch/x86/kernel/apic/apic.c
@@ -48,6 +48,7 @@
 #include <asm/hpet.h>
 #include <asm/idle.h>
 #include <asm/mtrr.h>
+#include <asm/time.h>
 #include <asm/smp.h>
 #include <asm/mce.h>
 #include <asm/tsc.h>
diff --git a/trunk/arch/x86/kernel/hpet.c b/trunk/arch/x86/kernel/hpet.c
index 85b8a8a76c21..0f4b0651cd3f 100644
--- a/trunk/arch/x86/kernel/hpet.c
+++ b/trunk/arch/x86/kernel/hpet.c
@@ -14,6 +14,7 @@
 
 #include <asm/fixmap.h>
 #include <asm/hpet.h>
+#include <asm/time.h>
 
 #define HPET_MASK			CLOCKSOURCE_MASK(32)
 
diff --git a/trunk/arch/x86/kernel/i8253.c b/trunk/arch/x86/kernel/i8253.c
index 9c92b6ff571f..5783e6de2079 100644
--- a/trunk/arch/x86/kernel/i8253.c
+++ b/trunk/arch/x86/kernel/i8253.c
@@ -14,6 +14,7 @@
 #include <linux/io.h>
 
 #include <asm/hpet.h>
+#include <asm/time.h>
 #include <asm/smp.h>
 
 /*