diff --git a/[refs] b/[refs]
index 7fdb9b818f76..b4ba825cdb3a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28769149c285e0a392d2e601ae0cc71ffc345f7d
+refs/heads/master: f5e0e93faf8421083853b2d7a217267f49e27cc3
diff --git a/trunk/arch/x86/kernel/i8253_32.c b/trunk/arch/x86/kernel/i8253_32.c
index 6d839f2f1b1a..ac15e4cbd9c1 100644
--- a/trunk/arch/x86/kernel/i8253_32.c
+++ b/trunk/arch/x86/kernel/i8253_32.c
@@ -13,7 +13,6 @@
 #include <asm/delay.h>
 #include <asm/i8253.h>
 #include <asm/io.h>
-#include <asm/timer.h>
 
 DEFINE_SPINLOCK(i8253_lock);
 EXPORT_SYMBOL(i8253_lock);
@@ -120,6 +119,7 @@ void __init setup_pit_timer(void)
 	global_clock_event = &pit_clockevent;
 }
 
+#ifndef CONFIG_X86_64
 /*
  * Since the PIT overflows every tick, its not very useful
  * to just read by itself. So use jiffies to emulate a free
@@ -204,3 +204,5 @@ static int __init init_pit_clocksource(void)
 	return clocksource_register(&clocksource_pit);
 }
 arch_initcall(init_pit_clocksource);
+
+#endif
diff --git a/trunk/include/asm-x86/i8253_32.h b/trunk/include/asm-x86/i8253_32.h
index 7577d058d86e..28cf67da59a3 100644
--- a/trunk/include/asm-x86/i8253_32.h
+++ b/trunk/include/asm-x86/i8253_32.h
@@ -1,8 +1,6 @@
 #ifndef __ASM_I8253_H__
 #define __ASM_I8253_H__
 
-#include <linux/clockchips.h>
-
 /* i8253A PIT registers */
 #define PIT_MODE		0x43
 #define PIT_CH0			0x40
@@ -10,8 +8,12 @@
 
 extern spinlock_t i8253_lock;
 
+#ifdef CONFIG_GENERIC_CLOCKEVENTS
+
 extern struct clock_event_device *global_clock_event;
 
 extern void setup_pit_timer(void);
 
+#endif
+
 #endif	/* __ASM_I8253_H__ */