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/sa1100_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/sa1100_ir.c')
| -rw-r--r-- | drivers/net/irda/sa1100_ir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c index 8d5a288d7976..937372d00398 100644 --- a/drivers/net/irda/sa1100_ir.c +++ b/drivers/net/irda/sa1100_ir.c | |||
| @@ -579,7 +579,7 @@ static void sa1100_irda_fir_irq(struct net_device *dev) | |||
| 579 | sa1100_irda_rx_dma_start(si); | 579 | sa1100_irda_rx_dma_start(si); |
| 580 | } | 580 | } |
| 581 | 581 | ||
| 582 | static irqreturn_t sa1100_irda_irq(int irq, void *dev_id, struct pt_regs *regs) | 582 | static irqreturn_t sa1100_irda_irq(int irq, void *dev_id) |
| 583 | { | 583 | { |
| 584 | struct net_device *dev = dev_id; | 584 | struct net_device *dev = dev_id; |
| 585 | if (IS_FIR(((struct sa1100_irda *)dev->priv))) | 585 | if (IS_FIR(((struct sa1100_irda *)dev->priv))) |