From 1edab614748caf8155951999217be890a71cabc9 Mon Sep 17 00:00:00 2001
From: Mingkai Hu <Mingkai.hu@freescale.com>
Date: Mon, 16 Apr 2012 10:05:07 +0800
Subject: [PATCH] --- yaml --- r: 299583 b: refs/heads/master c:
 dea58bd1cab8f6687a784cdacca242b6cac95ede h: refs/heads/master i:   299581:
 a18cf1c46e1bfebbec9323fd13fbe8546ae896df   299579:
 edbd7eedc864d3842e3b4e9ae5bb97cd35ccf9d0   299575:
 2b1bae87fcb2c598b0dcc0762a6b13569a613d86   299567:
 26c83bf3473cb8092f11304c80dc3fd8a948399a   299551:
 be89144db1f65079a9d4b505a439bcd51e7b527f   299519:
 2f3aa68eee895b60d2e555b7648975f8d870aedd v: v3

---
 [refs]                                | 2 +-
 trunk/arch/powerpc/sysdev/mpic_msgr.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b2e650260f92..a768afee77bf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0a5a6c38190a5016bcb0f1267324a19b846a35a
+refs/heads/master: dea58bd1cab8f6687a784cdacca242b6cac95ede
diff --git a/trunk/arch/powerpc/sysdev/mpic_msgr.c b/trunk/arch/powerpc/sysdev/mpic_msgr.c
index dc1cfe380070..483d8fa72e8b 100644
--- a/trunk/arch/powerpc/sysdev/mpic_msgr.c
+++ b/trunk/arch/powerpc/sysdev/mpic_msgr.c
@@ -228,7 +228,7 @@ static __devinit int mpic_msgr_probe(struct platform_device *dev)
 
 		reg_number = block_number * MPIC_MSGR_REGISTERS_PER_BLOCK + i;
 		msgr->base = msgr_block_addr + i * MPIC_MSGR_STRIDE;
-		msgr->mer = msgr->base + MPIC_MSGR_MER_OFFSET;
+		msgr->mer = (u32 *)((u8 *)msgr->base + MPIC_MSGR_MER_OFFSET);
 		msgr->in_use = MSGR_FREE;
 		msgr->num = i;
 		raw_spin_lock_init(&msgr->lock);