summaryrefslogtreecommitdiffstats
path: root/arch/ppc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-12-20 09:41:25 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-12-20 09:41:25 -0800
commitd5d74efbeac61c73431e8ef032e97d2d1004ce88 (patch)
tree7ad8a86b8d203ef566cb89656bf394a8dcd7edd3 /arch/ppc
parentfc7e13104f823d1ea9c1f4dd7531c14b0c1e6e7e (diff)
parent5a1244e9ddb77eafb1de69a1be14e06ca04e733a (diff)
downloadop-kernel-dev-d5d74efbeac61c73431e8ef032e97d2d1004ce88.zip
op-kernel-dev-d5d74efbeac61c73431e8ef032e97d2d1004ce88.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/ppc')
-rw-r--r--arch/ppc/platforms/85xx/mpc85xx_cds_common.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
index d8991b8..5e8cc5e 100644
--- a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
+++ b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
@@ -130,10 +130,11 @@ mpc85xx_cds_show_cpuinfo(struct seq_file *m)
}
#ifdef CONFIG_CPM2
-static void cpm2_cascade(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t cpm2_cascade(int irq, void *dev_id, struct pt_regs *regs)
{
while((irq = cpm2_get_irq(regs)) >= 0)
__do_IRQ(irq, regs);
+ return IRQ_HANDLED;
}
static struct irqaction cpm2_irqaction = {
OpenPOWER on IntegriCloud