From 19a214686b647fba82758008e36314df830e6070 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed, 30 Mar 2011 11:07:13 +1100
Subject: [PATCH] --- yaml --- r: 243523 b: refs/heads/master c:
 b3cf2bb3d5de306aebfd1dfbcb0c8d33c0214046 h: refs/heads/master i:   243521:
 f2acd49d42df205c144c620dbd84b23be70951f2   243519:
 ad9ed421ac852fc3d3d0f6175a108befb6d33374 v: v3

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

diff --git a/[refs] b/[refs]
index 476901348f0d..4a4700a93f03 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8987eccde8abce02a4fc765d81a4c5de3d110ab5
+refs/heads/master: b3cf2bb3d5de306aebfd1dfbcb0c8d33c0214046
diff --git a/trunk/arch/powerpc/sysdev/mpc8xx_pic.c b/trunk/arch/powerpc/sysdev/mpc8xx_pic.c
index f550e23632f8..a88800ff4d01 100644
--- a/trunk/arch/powerpc/sysdev/mpc8xx_pic.c
+++ b/trunk/arch/powerpc/sysdev/mpc8xx_pic.c
@@ -80,7 +80,7 @@ static int mpc8xx_set_irq_type(struct irq_data *d, unsigned int flow_type)
 		if ((hw & 1) == 0) {
 			siel |= (0x80000000 >> hw);
 			out_be32(&siu_reg->sc_siel, siel);
-			__irq_set_handler_locked(irq, handle_edge_irq);
+			__irq_set_handler_locked(d->irq, handle_edge_irq);
 		}
 	}
 	return 0;