diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
| commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
| tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /arch/ppc/syslib/cpm2_pic.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'arch/ppc/syslib/cpm2_pic.c')
| -rw-r--r-- | arch/ppc/syslib/cpm2_pic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/syslib/cpm2_pic.c b/arch/ppc/syslib/cpm2_pic.c index c0fee0beb815..fb2d5842641a 100644 --- a/arch/ppc/syslib/cpm2_pic.c +++ b/arch/ppc/syslib/cpm2_pic.c | |||
| @@ -123,7 +123,7 @@ static struct hw_interrupt_type cpm2_pic = { | |||
| 123 | .end = cpm2_end_irq, | 123 | .end = cpm2_end_irq, |
| 124 | }; | 124 | }; |
| 125 | 125 | ||
| 126 | int cpm2_get_irq(struct pt_regs *regs) | 126 | int cpm2_get_irq(void) |
| 127 | { | 127 | { |
| 128 | int irq; | 128 | int irq; |
| 129 | unsigned long bits; | 129 | unsigned long bits; |