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/rrunner.h | |
| 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/rrunner.h')
| -rw-r--r-- | drivers/net/rrunner.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/rrunner.h b/drivers/net/rrunner.h index 99451b523399..9f3e050c4dc6 100644 --- a/drivers/net/rrunner.h +++ b/drivers/net/rrunner.h | |||
| @@ -829,7 +829,7 @@ struct rr_private | |||
| 829 | */ | 829 | */ |
| 830 | static int rr_init(struct net_device *dev); | 830 | static int rr_init(struct net_device *dev); |
| 831 | static int rr_init1(struct net_device *dev); | 831 | static int rr_init1(struct net_device *dev); |
| 832 | static irqreturn_t rr_interrupt(int irq, void *dev_id, struct pt_regs *regs); | 832 | static irqreturn_t rr_interrupt(int irq, void *dev_id); |
| 833 | 833 | ||
| 834 | static int rr_open(struct net_device *dev); | 834 | static int rr_open(struct net_device *dev); |
| 835 | static int rr_start_xmit(struct sk_buff *skb, struct net_device *dev); | 835 | static int rr_start_xmit(struct sk_buff *skb, struct net_device *dev); |