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/net/irda/ali-ircc.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/net/irda/ali-ircc.c')
| -rw-r--r-- | drivers/net/irda/ali-ircc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c index 68d4c418cb98..971e2dee1e6b 100644 --- a/drivers/net/irda/ali-ircc.c +++ b/drivers/net/irda/ali-ircc.c | |||
| @@ -660,8 +660,7 @@ static int ali_ircc_read_dongle_id (int i, chipio_t *info) | |||
| 660 | * An interrupt from the chip has arrived. Time to do some work | 660 | * An interrupt from the chip has arrived. Time to do some work |
| 661 | * | 661 | * |
| 662 | */ | 662 | */ |
| 663 | static irqreturn_t ali_ircc_interrupt(int irq, void *dev_id, | 663 | static irqreturn_t ali_ircc_interrupt(int irq, void *dev_id) |
| 664 | struct pt_regs *regs) | ||
| 665 | { | 664 | { |
| 666 | struct net_device *dev = (struct net_device *) dev_id; | 665 | struct net_device *dev = (struct net_device *) dev_id; |
| 667 | struct ali_ircc_cb *self; | 666 | struct ali_ircc_cb *self; |