diff --git a/[refs] b/[refs]
index 9d478d6b9016..42a135d5b767 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4ab0cfd7df6e74283ce6eae8d1dd6d63e28bcee
+refs/heads/master: 185bfbf6fac3e5bf8cd19c84aa520438a7d70022
diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile
index 6f3a7f211811..559f1f77185b 100644
--- a/trunk/arch/i386/kernel/Makefile
+++ b/trunk/arch/i386/kernel/Makefile
@@ -41,7 +41,7 @@ obj-$(CONFIG_HPET_TIMER) 	+= hpet.o
 obj-$(CONFIG_K8_NB)		+= k8.o
 obj-$(CONFIG_MGEODE_LX)		+= geode.o
 
-obj-$(CONFIG_VMI)		+= vmi.o vmiclock_32.o
+obj-$(CONFIG_VMI)		+= vmi_32.o vmiclock_32.o
 obj-$(CONFIG_PARAVIRT)		+= paravirt.o
 obj-y				+= pcspeaker.o
 
diff --git a/trunk/arch/i386/kernel/vmi.c b/trunk/arch/i386/kernel/vmi_32.c
similarity index 100%
rename from trunk/arch/i386/kernel/vmi.c
rename to trunk/arch/i386/kernel/vmi_32.c