diff --git a/[refs] b/[refs]
index 7f79fa90bf8f..41056b672fe1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bef9f9de32ec201ea5372caf2c76e7c71f80ee35
+refs/heads/master: 55f93afd89fe6b9b9e12cfb2d3eb1a68e21f529e
diff --git a/trunk/drivers/char/rtc.c b/trunk/drivers/char/rtc.c
index 30c3f54c7666..ec6b65ec69ea 100644
--- a/trunk/drivers/char/rtc.c
+++ b/trunk/drivers/char/rtc.c
@@ -82,7 +82,7 @@
 #include <asm/uaccess.h>
 #include <asm/system.h>
 
-#if defined(__i386__)
+#ifdef CONFIG_X86
 #include <asm/hpet.h>
 #endif
 
diff --git a/trunk/include/asm-x86_64/apic.h b/trunk/include/asm-x86_64/apic.h
index 45e9fca1febc..4c2d84dd4f2b 100644
--- a/trunk/include/asm-x86_64/apic.h
+++ b/trunk/include/asm-x86_64/apic.h
@@ -86,6 +86,8 @@ extern void setup_apic_routing(void);
 extern void setup_APIC_extened_lvt(unsigned char lvt_off, unsigned char vector,
 				   unsigned char msg_type, unsigned char mask);
 
+extern int apic_is_clustered_box(void);
+
 #define K8_APIC_EXT_LVT_BASE    0x500
 #define K8_APIC_EXT_INT_MSG_FIX 0x0
 #define K8_APIC_EXT_INT_MSG_SMI 0x2
diff --git a/trunk/include/asm-x86_64/hpet.h b/trunk/include/asm-x86_64/hpet.h
index 59a66f084611..71ccdd11d7f0 100644
--- a/trunk/include/asm-x86_64/hpet.h
+++ b/trunk/include/asm-x86_64/hpet.h
@@ -55,7 +55,6 @@
 
 extern int is_hpet_enabled(void);
 extern int hpet_rtc_timer_init(void);
-extern int apic_is_clustered_box(void);
 extern int hpet_arch_init(void);
 extern int hpet_timer_stop_set_go(unsigned long tick);
 extern int hpet_reenable(void);
diff --git a/trunk/include/asm-x86_64/timex.h b/trunk/include/asm-x86_64/timex.h
index f6527e1b6c1c..6ed21f44d308 100644
--- a/trunk/include/asm-x86_64/timex.h
+++ b/trunk/include/asm-x86_64/timex.h
@@ -9,7 +9,6 @@
 #include <asm/8253pit.h>
 #include <asm/msr.h>
 #include <asm/vsyscall.h>
-#include <asm/hpet.h>
 #include <asm/system.h>
 #include <asm/processor.h>
 #include <asm/tsc.h>