diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 09:56:12 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 09:56:12 +0200 |
| commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
| tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /drivers/char/synclinkmp.c | |
| parent | [netdrvr] b44: handle excessive multicast groups (diff) | |
| parent | ACPI: Allow setting SCI_EN bit in PM1_CONTROL register (diff) | |
| download | linux-24fcbacedb0d83cabc6761acbecfbf751265ce52.tar.xz linux-24fcbacedb0d83cabc6761acbecfbf751265ce52.zip | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/char/synclinkmp.c')
| -rw-r--r-- | drivers/char/synclinkmp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c index 6eb75dcd7961..3e932b681371 100644 --- a/drivers/char/synclinkmp.c +++ b/drivers/char/synclinkmp.c @@ -2596,8 +2596,7 @@ void isr_io_pin( SLMP_INFO *info, u16 status ) * dev_id device ID supplied during interrupt registration * regs interrupted processor context */ -static irqreturn_t synclinkmp_interrupt(int irq, void *dev_id, - struct pt_regs *regs) +static irqreturn_t synclinkmp_interrupt(int irq, void *dev_id) { SLMP_INFO * info; unsigned char status, status0, status1=0; |