diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
| commit | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (patch) | |
| tree | 93824f573767da634fbc82c388b6d33cc454212b /drivers/net/irda/vlsi_ir.c | |
| parent | c1a26e7d40fb814716950122353a1a556844286b (diff) | |
| parent | 7d12e780e003f93433d49ce78cfedf4b4c52adc5 (diff) | |
Merge git://git.infradead.org/~dhowells/irq-2.6
* git://git.infradead.org/~dhowells/irq-2.6:
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
IRQ: Typedef the IRQ handler function type
IRQ: Typedef the IRQ flow handler function type
Diffstat (limited to 'drivers/net/irda/vlsi_ir.c')
| -rw-r--r-- | drivers/net/irda/vlsi_ir.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c index 92d646cc9edc..18c68193bf14 100644 --- a/drivers/net/irda/vlsi_ir.c +++ b/drivers/net/irda/vlsi_ir.c | |||
| @@ -1455,8 +1455,7 @@ static int vlsi_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd) | |||
| 1455 | 1455 | ||
| 1456 | /********************************************************/ | 1456 | /********************************************************/ |
| 1457 | 1457 | ||
| 1458 | static irqreturn_t vlsi_interrupt(int irq, void *dev_instance, | 1458 | static irqreturn_t vlsi_interrupt(int irq, void *dev_instance) |
| 1459 | struct pt_regs *regs) | ||
| 1460 | { | 1459 | { |
| 1461 | struct net_device *ndev = dev_instance; | 1460 | struct net_device *ndev = dev_instance; |
| 1462 | vlsi_irda_dev_t *idev = ndev->priv; | 1461 | vlsi_irda_dev_t *idev = ndev->priv; |