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/ns83820.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/ns83820.c')
-rw-r--r-- | drivers/net/ns83820.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c index e10da1aa3d30..b0127c71a5b6 100644 --- a/drivers/net/ns83820.c +++ b/drivers/net/ns83820.c | |||
@@ -1288,7 +1288,7 @@ static void ns83820_mib_isr(struct ns83820 *dev) | |||
1288 | } | 1288 | } |
1289 | 1289 | ||
1290 | static void ns83820_do_isr(struct net_device *ndev, u32 isr); | 1290 | static void ns83820_do_isr(struct net_device *ndev, u32 isr); |
1291 | static irqreturn_t ns83820_irq(int foo, void *data, struct pt_regs *regs) | 1291 | static irqreturn_t ns83820_irq(int foo, void *data) |
1292 | { | 1292 | { |
1293 | struct net_device *ndev = data; | 1293 | struct net_device *ndev = data; |
1294 | struct ns83820 *dev = PRIV(ndev); | 1294 | struct ns83820 *dev = PRIV(ndev); |