From d37c70bc45e74f11ba2156599b2aff893161d560 Mon Sep 17 00:00:00 2001 From: "Kirill A. Shutemov" Date: Thu, 3 May 2012 15:08:08 +0100 Subject: [PATCH] --- yaml --- r: 307239 b: refs/heads/master c: 846a6038d6260153cb16377515e372ed10a2020f h: refs/heads/master i: 307237: eb801b92ee8e67fbae1ace104ecc11cbb8311195 307235: cfa31f607f5aae2933ee4675748ffdaa421c2cc8 307231: cc75f725502c5010b76406fd6050a18ce1416622 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/gma500/psb_drv.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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; /*