diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-20 18:41:25 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-20 18:41:25 +0100 |
| commit | d5d74efbeac61c73431e8ef032e97d2d1004ce88 (patch) | |
| tree | 7ad8a86b8d203ef566cb89656bf394a8dcd7edd3 /arch/ppc | |
| parent | Merge branch 'fixes' of git://git.linux-nfs.org/pub/linux/nfs-2.6 (diff) | |
| parent | powerpc: update defconfigs (diff) | |
| download | linux-d5d74efbeac61c73431e8ef032e97d2d1004ce88.tar.xz linux-d5d74efbeac61c73431e8ef032e97d2d1004ce88.zip | |
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.c | 3 |
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 d8991b88dc9c..5e8cc5ec6ab5 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 = { |