From 28274b208951428cbc66a8dd08b2e1df31744911 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 14 Sep 2012 20:30:12 +0000
Subject: [PATCH] --- yaml --- r: 326598 b: refs/heads/master c:
 fe73f03549a28204866387311f7d3d9ef5e1503a h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/input/mouse/rpcmouse.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bc435c9a613b..316815cd2c20 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5fa1a2e12a3bc7614db7b5f5f4b1167e5e25a9e6
+refs/heads/master: fe73f03549a28204866387311f7d3d9ef5e1503a
diff --git a/trunk/drivers/input/mouse/rpcmouse.c b/trunk/drivers/input/mouse/rpcmouse.c
index 272deddc8db6..21c60fea5d31 100644
--- a/trunk/drivers/input/mouse/rpcmouse.c
+++ b/trunk/drivers/input/mouse/rpcmouse.c
@@ -42,7 +42,7 @@ static irqreturn_t rpcmouse_irq(int irq, void *dev_id)
 
 	x = (short) iomd_readl(IOMD_MOUSEX);
 	y = (short) iomd_readl(IOMD_MOUSEY);
-	b = (short) (__raw_readl(0xe0310000) ^ 0x70);
+	b = (short) (__raw_readl(IOMEM(0xe0310000)) ^ 0x70);
 
 	dx = x - rpcmouse_lastx;
 	dy = y - rpcmouse_lasty;