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/lance.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/lance.c')
-rw-r--r-- | drivers/net/lance.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/lance.c b/drivers/net/lance.c index f349e88e0ddf..7afac47e59ad 100644 --- a/drivers/net/lance.c +++ b/drivers/net/lance.c | |||
@@ -301,7 +301,7 @@ static int lance_open(struct net_device *dev); | |||
301 | static void lance_init_ring(struct net_device *dev, gfp_t mode); | 301 | static void lance_init_ring(struct net_device *dev, gfp_t mode); |
302 | static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev); | 302 | static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev); |
303 | static int lance_rx(struct net_device *dev); | 303 | static int lance_rx(struct net_device *dev); |
304 | static irqreturn_t lance_interrupt(int irq, void *dev_id, struct pt_regs *regs); | 304 | static irqreturn_t lance_interrupt(int irq, void *dev_id); |
305 | static int lance_close(struct net_device *dev); | 305 | static int lance_close(struct net_device *dev); |
306 | static struct net_device_stats *lance_get_stats(struct net_device *dev); | 306 | static struct net_device_stats *lance_get_stats(struct net_device *dev); |
307 | static void set_multicast_list(struct net_device *dev); | 307 | static void set_multicast_list(struct net_device *dev); |
@@ -1012,8 +1012,7 @@ out: | |||
1012 | } | 1012 | } |
1013 | 1013 | ||
1014 | /* The LANCE interrupt handler. */ | 1014 | /* The LANCE interrupt handler. */ |
1015 | static irqreturn_t | 1015 | static irqreturn_t lance_interrupt(int irq, void *dev_id) |
1016 | lance_interrupt(int irq, void *dev_id, struct pt_regs * regs) | ||
1017 | { | 1016 | { |
1018 | struct net_device *dev = dev_id; | 1017 | struct net_device *dev = dev_id; |
1019 | struct lance_private *lp; | 1018 | struct lance_private *lp; |