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 /drivers/char/snsc_event.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
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); | |||
| 36 | * destination. | 36 | * destination. |
| 37 | */ | 37 | */ |
| 38 | static irqreturn_t | 38 | static irqreturn_t |
| 39 | scdrv_event_interrupt(int irq, void *subch_data, struct pt_regs *regs) | 39 | scdrv_event_interrupt(int irq, void *subch_data) |
| 40 | { | 40 | { |
| 41 | struct subch_data_s *sd = subch_data; | 41 | struct subch_data_s *sd = subch_data; |
| 42 | unsigned long flags; | 42 | unsigned long flags; |