---

yaml --- r: 299583 b: refs/heads/master c: dea58bd h: refs/heads/master i: 299581: a18cf1c 299579: edbd7ee 299575: 2b1bae8 299567: 26c83bf 299551: be89144 299519: 2f3aa68 v: v3
git-mirror · Apr 19, 2012 · 1edab61 · 1edab61
1 parent 9a63ded
commit 1edab61
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);