diff --git a/[refs] b/[refs]
index bf6d7f768bcb..d91851b6551b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77399ad90a8bd05f4b16da2ee398062d89f1719c
+refs/heads/master: ae47fd49c73b7f4875bd1bf06f02f4209d5d2470
diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile
index 4967012119ae..8bd7e8730046 100644
--- a/trunk/arch/i386/kernel/Makefile
+++ b/trunk/arch/i386/kernel/Makefile
@@ -37,7 +37,7 @@ obj-$(CONFIG_EFI) 		+= efi_32.o efi_stub_32.o
 obj-$(CONFIG_DOUBLEFAULT) 	+= doublefault.o
 obj-$(CONFIG_VM86)		+= vm86_32.o
 obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
-obj-$(CONFIG_HPET_TIMER) 	+= hpet.o
+obj-$(CONFIG_HPET_TIMER) 	+= hpet_32.o
 obj-$(CONFIG_K8_NB)		+= k8.o
 obj-$(CONFIG_MGEODE_LX)		+= geode.o
 
diff --git a/trunk/arch/i386/kernel/hpet.c b/trunk/arch/i386/kernel/hpet_32.c
similarity index 100%
rename from trunk/arch/i386/kernel/hpet.c
rename to trunk/arch/i386/kernel/hpet_32.c