diff --git a/[refs] b/[refs]
index 4573e90c9531..cd0c1f8aa35f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eab37607147b90e390aff357e67783e2b8008813
+refs/heads/master: 846a6038d6260153cb16377515e372ed10a2020f
diff --git a/trunk/drivers/gpu/drm/gma500/psb_drv.h b/trunk/drivers/gpu/drm/gma500/psb_drv.h
index 9dc447632c90..e59511d74934 100644
--- a/trunk/drivers/gpu/drm/gma500/psb_drv.h
+++ b/trunk/drivers/gpu/drm/gma500/psb_drv.h
@@ -525,8 +525,8 @@ struct drm_psb_private {
 	 * Register base
 	 */
 
-	uint8_t *sgx_reg;
-	uint8_t *vdc_reg;
+	uint8_t __iomem *sgx_reg;
+	uint8_t __iomem *vdc_reg;
 	uint32_t gatt_free_offset;
 
 	/*