diff options
| author |   Olof Johansson <olof@lixom.net> | 2006-10-05 20:31:10 -0500 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 18:39:04 -0700 |
| commit | 49f19ce401edfff937c448dd74c22497da361889 (patch) | |
| tree | 3c657340fd3a34fcff516bbf09c4d72f5e141c7b /arch/powerpc/platforms/85xx | |
| parent | Merge git://git.infradead.org/~dhowells/irq-2.6 (diff) | |
| download | linux-dev-49f19ce401edfff937c448dd74c22497da361889.tar.xz linux-dev-49f19ce401edfff937c448dd74c22497da361889.zip | |
[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.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/85xx/mpc85xx_cds.c | 2 |
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, int cascade_irq; while ((cascade_irq = cpm2_get_irq(regs)) >= 0) { - generic_handle_irq(cascade_irq, regs); + generic_handle_irq(cascade_irq); } desc->chip->eoi(irq); } 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 unsigned int cascade_irq = i8259_irq(regs); if (cascade_irq != NO_IRQ) - generic_handle_irq(cascade_irq, regs); + generic_handle_irq(cascade_irq); desc->chip->eoi(irq); } |