From 0d6feb905759c65cf995cd6d4fc7c6eb8541772c Mon Sep 17 00:00:00 2001
From: Becky Bruce <becky.bruce@freescale.com>
Date: Mon, 14 Jan 2008 20:56:18 -0600
Subject: [PATCH] --- yaml --- r: 81279 b: refs/heads/master c:
 c51a3fdc0a950dc65b4d552497e54cf60677f8a5 h: refs/heads/master i:   81277:
 ac30f98abcf08f0ad06724638ac55d2516c94e64   81275:
 36e0abee3c23dc585253fb72eb1c1e93a7f95dc6   81271:
 8520a25aa815cc8e897216b5e338a4ede619ba51   81263:
 bf5834ec773b5a10a2e94d050486f57ca0b71106   81247:
 f9b6b021bd79d23d33a914067c693e80649c97d5   81215:
 c731f7c0391d62739f8b11ac7a69db1b0d2e15dd   81151:
 3ef13a0506408c08f10c7be38116777f12d5366e v: v3

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

diff --git a/[refs] b/[refs]
index b73ddc5ed6ee..f01a92763bff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82f0183ef3c8832684ec460cfbd4693cc8732a7a
+refs/heads/master: c51a3fdc0a950dc65b4d552497e54cf60677f8a5
diff --git a/trunk/arch/powerpc/sysdev/mpic.c b/trunk/arch/powerpc/sysdev/mpic.c
index f88ff09c4711..0da7069c7c62 100644
--- a/trunk/arch/powerpc/sysdev/mpic.c
+++ b/trunk/arch/powerpc/sysdev/mpic.c
@@ -267,7 +267,7 @@ static inline void _mpic_irq_write(struct mpic *mpic, unsigned int src_no,
  */
 
 
-static void _mpic_map_mmio(struct mpic *mpic, unsigned long phys_addr,
+static void _mpic_map_mmio(struct mpic *mpic, phys_addr_t phys_addr,
 			   struct mpic_reg_bank *rb, unsigned int offset,
 			   unsigned int size)
 {
@@ -287,7 +287,7 @@ static void _mpic_map_dcr(struct mpic *mpic, struct mpic_reg_bank *rb,
 	BUG_ON(!DCR_MAP_OK(rb->dhost));
 }
 
-static inline void mpic_map(struct mpic *mpic, unsigned long phys_addr,
+static inline void mpic_map(struct mpic *mpic, phys_addr_t phys_addr,
 			    struct mpic_reg_bank *rb, unsigned int offset,
 			    unsigned int size)
 {