diff --git a/[refs] b/[refs]
index 18d9c189376e..aec30291ecdb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3682a08049fdf03c3c83b4ce44146dea19057fd7
+refs/heads/master: 641b41858b29d4ebf1be3921cab7b2cac7b18111
diff --git a/trunk/drivers/staging/gma500/Makefile b/trunk/drivers/staging/gma500/Makefile
index c0143732f323..d4a87c07e177 100644
--- a/trunk/drivers/staging/gma500/Makefile
+++ b/trunk/drivers/staging/gma500/Makefile
@@ -11,6 +11,7 @@ psb_gfx-y += gem_glue.o \
 	  gtt.o \
 	  intel_bios.o \
 	  intel_opregion.o \
+	  mmu.o \
 	  power.o \
 	  psb_drv.o \
 	  psb_intel_display.o \
@@ -19,7 +20,6 @@ psb_gfx-y += gem_glue.o \
 	  psb_intel_modes.o \
 	  psb_intel_sdvo.o \
 	  psb_lid.o \
-	  psb_mmu.o \
 	  psb_irq.o \
 	  psb_device.o \
 	  mid_bios.o
diff --git a/trunk/drivers/staging/gma500/psb_mmu.c b/trunk/drivers/staging/gma500/mmu.c
similarity index 100%
rename from trunk/drivers/staging/gma500/psb_mmu.c
rename to trunk/drivers/staging/gma500/mmu.c