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/open_pic2.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'arch/ppc/syslib/open_pic2.c')
| -rw-r--r-- | arch/ppc/syslib/open_pic2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/syslib/open_pic2.c b/arch/ppc/syslib/open_pic2.c index e1ff971539ea..d585207f9f77 100644 --- a/arch/ppc/syslib/open_pic2.c +++ b/arch/ppc/syslib/open_pic2.c | |||
| @@ -529,7 +529,7 @@ static void openpic2_end_irq(unsigned int irq_nr) | |||
| 529 | } | 529 | } |
| 530 | 530 | ||
| 531 | int | 531 | int |
| 532 | openpic2_get_irq(struct pt_regs *regs) | 532 | openpic2_get_irq(void) |
| 533 | { | 533 | { |
| 534 | int irq = openpic2_irq(); | 534 | int irq = openpic2_irq(); |
| 535 | 535 | ||