diff --git a/[refs] b/[refs]
index 7ccea0184f9a..37b546e6844b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcf92202e7bc2e8513ae045e3ec61e79c1c9e690
+refs/heads/master: 0333592ff9e936c6e5ae143e7418468a3198b54d
diff --git a/trunk/drivers/gpu/drm/gma500/psb_device.c b/trunk/drivers/gpu/drm/gma500/psb_device.c
index 6a67cec33845..1726c04dedda 100644
--- a/trunk/drivers/gpu/drm/gma500/psb_device.c
+++ b/trunk/drivers/gpu/drm/gma500/psb_device.c
@@ -353,7 +353,7 @@ static int psb_chip_setup(struct drm_device *dev)
 }
 
 /* Not exactly an erratum more an irritation */
-static int psb_chip_errata(struct drm_device *dev)
+static void psb_chip_errata(struct drm_device *dev)
 {
 	struct drm_psb_private *dev_priv = dev->dev_private;
 	psb_lid_timer_init(dev_priv);