aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/85xx
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2006-10-05 21:31:10 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-05 21:39:04 -0400
commit49f19ce401edfff937c448dd74c22497da361889 (patch)
tree3c657340fd3a34fcff516bbf09c4d72f5e141c7b /arch/powerpc/platforms/85xx
parent44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff)
[PATCH] powerpc: irq change build breaks
Fix up some of the buildbreaks from the irq handler changes. Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/powerpc/platforms/85xx')
-rw-r--r--arch/powerpc/platforms/85xx/mpc85xx_ads.c2
-rw-r--r--arch/powerpc/platforms/85xx/mpc85xx_cds.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
index 28070e7ae507..8af7126fc6b9 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
@@ -72,7 +72,7 @@ static void cpm2_cascade(unsigned int irq, struct irq_desc *desc,
72 int cascade_irq; 72 int cascade_irq;
73 73
74 while ((cascade_irq = cpm2_get_irq(regs)) >= 0) { 74 while ((cascade_irq = cpm2_get_irq(regs)) >= 0) {
75 generic_handle_irq(cascade_irq, regs); 75 generic_handle_irq(cascade_irq);
76 } 76 }
77 desc->chip->eoi(irq); 77 desc->chip->eoi(irq);
78} 78}
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
index 193a5d7921b5..b92fc6976a47 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
@@ -138,7 +138,7 @@ static void mpc85xx_8259_cascade(unsigned int irq, struct
138 unsigned int cascade_irq = i8259_irq(regs); 138 unsigned int cascade_irq = i8259_irq(regs);
139 139
140 if (cascade_irq != NO_IRQ) 140 if (cascade_irq != NO_IRQ)
141 generic_handle_irq(cascade_irq, regs); 141 generic_handle_irq(cascade_irq);
142 142
143 desc->chip->eoi(irq); 143 desc->chip->eoi(irq);
144} 144}