diff --git a/[refs] b/[refs]
index 38ac8a4d47f3..6daabf4eb2a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba733ec4725df406a6ff5c5c1e6c447f42bbf39d
+refs/heads/master: c4fbd8a94697ff1186130542f36d7b520b288001
diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/arch/x86_64/kernel/Makefile
index 9799e58c243a..e74f4ddba1cd 100644
--- a/trunk/arch/x86_64/kernel/Makefile
+++ b/trunk/arch/x86_64/kernel/Makefile
@@ -8,7 +8,7 @@ obj-y	:= process.o signal.o entry.o traps_64.o irq.o \
 		ptrace.o time.o ioport_64.o ldt.o setup_64.o i8259_64.o sys_x86_64.o \
 		x8664_ksyms.o i387.o syscall.o vsyscall_64.o \
 		setup64.o bootflag.o e820_64.o reboot.o quirks.o i8237.o \
-		pci-dma_64.o pci-nommu.o alternative.o hpet_64.o tsc.o bugs.o \
+		pci-dma_64.o pci-nommu_64.o alternative.o hpet_64.o tsc.o bugs.o \
 		perfctr-watchdog.o
 
 obj-$(CONFIG_STACKTRACE)	+= stacktrace.o
diff --git a/trunk/arch/x86_64/kernel/pci-nommu.c b/trunk/arch/x86_64/kernel/pci-nommu_64.c
similarity index 100%
rename from trunk/arch/x86_64/kernel/pci-nommu.c
rename to trunk/arch/x86_64/kernel/pci-nommu_64.c