diff --git a/[refs] b/[refs]
index 61e8017d03fe..86fe7682dbaa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3f500516442ffbbfdf3473590e42a3dcabeb96e
+refs/heads/master: 63e21a5bfc97ba2552d7efbb09462b0946af1176
diff --git a/trunk/drivers/staging/gma500/Makefile b/trunk/drivers/staging/gma500/Makefile
index d2c0887fd469..0603949ee745 100644
--- a/trunk/drivers/staging/gma500/Makefile
+++ b/trunk/drivers/staging/gma500/Makefile
@@ -6,11 +6,11 @@ ccflags-y += -Iinclude/drm
 psb_gfx-y += gem_glue.o \
 	  accel_2d.o \
 	  backlight.o \
-	  power.o \
 	  framebuffer.o \
+	  gem.o \
+	  gtt.o \
+	  power.o \
 	  psb_drv.o \
-	  psb_gem.o \
-	  psb_gtt.o \
 	  psb_intel_bios.o \
 	  psb_intel_opregion.o \
 	  psb_intel_display.o \
diff --git a/trunk/drivers/staging/gma500/psb_gem.c b/trunk/drivers/staging/gma500/gem.c
similarity index 100%
rename from trunk/drivers/staging/gma500/psb_gem.c
rename to trunk/drivers/staging/gma500/gem.c
diff --git a/trunk/drivers/staging/gma500/psb_gtt.c b/trunk/drivers/staging/gma500/gtt.c
similarity index 100%
rename from trunk/drivers/staging/gma500/psb_gtt.c
rename to trunk/drivers/staging/gma500/gtt.c
diff --git a/trunk/drivers/staging/gma500/psb_gtt.h b/trunk/drivers/staging/gma500/gtt.h
similarity index 100%
rename from trunk/drivers/staging/gma500/psb_gtt.h
rename to trunk/drivers/staging/gma500/gtt.h
diff --git a/trunk/drivers/staging/gma500/psb_drv.h b/trunk/drivers/staging/gma500/psb_drv.h
index 9c6aba541294..307ff9c86fda 100644
--- a/trunk/drivers/staging/gma500/psb_drv.h
+++ b/trunk/drivers/staging/gma500/psb_drv.h
@@ -29,7 +29,7 @@
 #include "psb_drm.h"
 #include "psb_reg.h"
 #include "psb_intel_drv.h"
-#include "psb_gtt.h"
+#include "gtt.h"
 #include "psb_powermgmt.h"
 #include "mrst.h"