diff --git a/[refs] b/[refs]
index 037fe8e28c76..18d9c189376e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b21fb57908c02a9cc0a62edcffc7fba00286e6d2
+refs/heads/master: 3682a08049fdf03c3c83b4ce44146dea19057fd7
diff --git a/trunk/drivers/staging/gma500/Makefile b/trunk/drivers/staging/gma500/Makefile
index 7f76a1923013..c0143732f323 100644
--- a/trunk/drivers/staging/gma500/Makefile
+++ b/trunk/drivers/staging/gma500/Makefile
@@ -10,9 +10,9 @@ psb_gfx-y += gem_glue.o \
 	  gem.o \
 	  gtt.o \
 	  intel_bios.o \
+	  intel_opregion.o \
 	  power.o \
 	  psb_drv.o \
-	  psb_intel_opregion.o \
 	  psb_intel_display.o \
 	  psb_intel_i2c.o \
 	  psb_intel_lvds.o \
diff --git a/trunk/drivers/staging/gma500/psb_intel_opregion.c b/trunk/drivers/staging/gma500/intel_opregion.c
similarity index 99%
rename from trunk/drivers/staging/gma500/psb_intel_opregion.c
rename to trunk/drivers/staging/gma500/intel_opregion.c
index a586f3de7658..824096510d4a 100644
--- a/trunk/drivers/staging/gma500/psb_intel_opregion.c
+++ b/trunk/drivers/staging/gma500/intel_opregion.c
@@ -78,4 +78,3 @@ int intel_opregion_exit(struct drm_device *dev)
 		iounmap(dev_priv->lid_state);
 	return 0;
 }
-	
\ No newline at end of file