diff --git a/[refs] b/[refs]
index ab1f12707c4e..61e8017d03fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 657839ba30a32e3317772493312812e3d80d7b4a
+refs/heads/master: c3f500516442ffbbfdf3473590e42a3dcabeb96e
diff --git a/trunk/drivers/staging/gma500/Makefile b/trunk/drivers/staging/gma500/Makefile
index fb6040f01d75..d2c0887fd469 100644
--- a/trunk/drivers/staging/gma500/Makefile
+++ b/trunk/drivers/staging/gma500/Makefile
@@ -4,12 +4,12 @@
 ccflags-y += -Iinclude/drm
 
 psb_gfx-y += gem_glue.o \
+	  accel_2d.o \
 	  backlight.o \
 	  power.o \
 	  framebuffer.o \
 	  psb_drv.o \
 	  psb_gem.o \
-	  psb_2d.o \
 	  psb_gtt.o \
 	  psb_intel_bios.o \
 	  psb_intel_opregion.o \
diff --git a/trunk/drivers/staging/gma500/psb_2d.c b/trunk/drivers/staging/gma500/accel_2d.c
similarity index 100%
rename from trunk/drivers/staging/gma500/psb_2d.c
rename to trunk/drivers/staging/gma500/accel_2d.c
diff --git a/trunk/drivers/staging/gma500/psb_drv.h b/trunk/drivers/staging/gma500/psb_drv.h
index 45035ecf2dbe..9c6aba541294 100644
--- a/trunk/drivers/staging/gma500/psb_drv.h
+++ b/trunk/drivers/staging/gma500/psb_drv.h
@@ -732,13 +732,13 @@ extern void mdfld_disable_te(struct drm_device *dev, int pipe);
 extern int psb_intel_opregion_init(struct drm_device *dev);
 
 /*
- *psb_fb.c
+ * framebuffer.c
  */
 extern int psbfb_probed(struct drm_device *dev);
 extern int psbfb_remove(struct drm_device *dev,
 			struct drm_framebuffer *fb);
 /*
- * psb_2d.c
+ * accel_2d.c
  */
 extern void psbfb_copyarea(struct fb_info *info,
 					const struct fb_copyarea *region);