diff --git a/[refs] b/[refs]
index d53e4b33eb67..8be6f64f1c9b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5924be937acbd1b11adb7be9b9bfab7ceda49050
+refs/heads/master: 7338d4357bb2c8f20e400432e1fe04a22cb868ad
diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile
index fff92c718b62..52b0041583cf 100644
--- a/trunk/arch/i386/kernel/Makefile
+++ b/trunk/arch/i386/kernel/Makefile
@@ -35,7 +35,7 @@ obj-y				+= sysenter.o vsyscall.o
 obj-$(CONFIG_ACPI_SRAT) 	+= srat_32.o
 obj-$(CONFIG_EFI) 		+= efi.o efi_stub.o
 obj-$(CONFIG_DOUBLEFAULT) 	+= doublefault.o
-obj-$(CONFIG_VM86)		+= vm86.o
+obj-$(CONFIG_VM86)		+= vm86_32.o
 obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
 obj-$(CONFIG_HPET_TIMER) 	+= hpet.o
 obj-$(CONFIG_K8_NB)		+= k8.o
diff --git a/trunk/arch/i386/kernel/vm86.c b/trunk/arch/i386/kernel/vm86_32.c
similarity index 100%
rename from trunk/arch/i386/kernel/vm86.c
rename to trunk/arch/i386/kernel/vm86_32.c