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/snsc_event.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/snsc_event.c')
-rw-r--r-- | drivers/char/snsc_event.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/snsc_event.c b/drivers/char/snsc_event.c index 864854c58866..2f56e8c54897 100644 --- a/drivers/char/snsc_event.c +++ b/drivers/char/snsc_event.c @@ -36,7 +36,7 @@ DECLARE_TASKLET(sn_sysctl_event, scdrv_event, 0); * destination. */ static irqreturn_t -scdrv_event_interrupt(int irq, void *subch_data, struct pt_regs *regs) +scdrv_event_interrupt(int irq, void *subch_data) { struct subch_data_s *sd = subch_data; unsigned long flags; |