diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-10-21 11:46:04 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-10-21 11:46:04 -0400 |
| commit | 513b046c96cc2fbce730a3474f6f7ff0c4fdd05c (patch) | |
| tree | e8006368b6f643067486f92405a404757807d6da /drivers/net/irda/vlsi_ir.c | |
| parent | 82810b7b6cc7a74c68881a13b0eb66c7a6370fcc (diff) | |
| parent | c7a3bd177f248d01ee18a01d22048c80e071c331 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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; |