diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
| commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
| tree | d0536e4da737900fa27b235f175a3d179d692200 /drivers/char/specialix.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/char/specialix.c')
| -rw-r--r-- | drivers/char/specialix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/specialix.c b/drivers/char/specialix.c index 902c48dca3bc..6022495571ae 100644 --- a/drivers/char/specialix.c +++ b/drivers/char/specialix.c | |||
| @@ -200,7 +200,7 @@ static struct specialix_port sx_port[SX_NBOARD * SX_NPORT]; | |||
| 200 | 200 | ||
| 201 | #ifdef SPECIALIX_TIMER | 201 | #ifdef SPECIALIX_TIMER |
| 202 | static struct timer_list missed_irq_timer; | 202 | static struct timer_list missed_irq_timer; |
| 203 | static irqreturn_t sx_interrupt(int irq, void * dev_id, struct pt_regs * regs); | 203 | static irqreturn_t sx_interrupt(int irq, void * dev_id); |
| 204 | #endif | 204 | #endif |
| 205 | 205 | ||
| 206 | 206 | ||
| @@ -897,7 +897,7 @@ static inline void sx_check_modem(struct specialix_board * bp) | |||
| 897 | 897 | ||
| 898 | 898 | ||
| 899 | /* The main interrupt processing routine */ | 899 | /* The main interrupt processing routine */ |
| 900 | static irqreturn_t sx_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 900 | static irqreturn_t sx_interrupt(int irq, void *dev_id) |
| 901 | { | 901 | { |
| 902 | unsigned char status; | 902 | unsigned char status; |
| 903 | unsigned char ack; | 903 | unsigned char ack; |