From 2f09022ebc297e096a11735ca5c9ed9a84ac3aed Mon Sep 17 00:00:00 2001
From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Date: Thu, 3 May 2012 15:09:22 +0100
Subject: [PATCH] --- yaml --- r: 307244 b: refs/heads/master c:
 1f17fcd07bb906d34b73ca11fbed01dcc2c0cf2f h: refs/heads/master v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f0a786589d2a..bfe0fbee65b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d64363c7557959cf9ddbcd17541a19769720f286
+refs/heads/master: 1f17fcd07bb906d34b73ca11fbed01dcc2c0cf2f
diff --git a/trunk/drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c b/trunk/drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c
index 5e84fbde749b..88627e3ba1e3 100644
--- a/trunk/drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c
+++ b/trunk/drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c
@@ -250,7 +250,7 @@ static irqreturn_t oaktrail_hdmi_i2c_handler(int this_irq, void *dev)
  */
 static void oaktrail_hdmi_i2c_gpio_fix(void)
 {
-	void *base;
+	void __iomem *base;
 	unsigned int gpio_base = 0xff12c000;
 	int gpio_len = 0x1000;
 	u32 temp;