X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Farm%2Fmach-integrator%2Fintegrator_cp.c;h=a0724f2b24cec783a242887971b5fc0d2e5a6592;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=9f55f5ae1044ffcd4e4a3080e581525646e8d639;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index 9f55f5ae1..a0724f2b2 100644
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -232,6 +232,8 @@ static void __init intcp_init_irq(void)
 	for (i = IRQ_PIC_START; i <= IRQ_PIC_END; i++) {
 		if (i == 11)
 			i = 22;
+		if (i == IRQ_CP_CPPLDINT)
+			i++;
 		if (i == 29)
 			break;
 		set_irq_chip(i, &pic_chip);
@@ -257,7 +259,8 @@ static void __init intcp_init_irq(void)
 		set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
 	}
 
-	set_irq_chained_handler(IRQ_CP_CPPLDINT, sic_handle_irq);
+	set_irq_handler(IRQ_CP_CPPLDINT, sic_handle_irq);
+	pic_unmask_irq(IRQ_CP_CPPLDINT);
 }
 
 /*