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/wireless/hostap/hostap_hw.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/wireless/hostap/hostap_hw.c')
| -rw-r--r-- | drivers/net/wireless/hostap/hostap_hw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c index d500012fdc7a..ed00ebb6e7f4 100644 --- a/drivers/net/wireless/hostap/hostap_hw.c +++ b/drivers/net/wireless/hostap/hostap_hw.c | |||
| @@ -2622,7 +2622,7 @@ static void prism2_check_magic(local_info_t *local) | |||
| 2622 | 2622 | ||
| 2623 | 2623 | ||
| 2624 | /* Called only from hardware IRQ */ | 2624 | /* Called only from hardware IRQ */ |
| 2625 | static irqreturn_t prism2_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 2625 | static irqreturn_t prism2_interrupt(int irq, void *dev_id) |
| 2626 | { | 2626 | { |
| 2627 | struct net_device *dev = (struct net_device *) dev_id; | 2627 | struct net_device *dev = (struct net_device *) dev_id; |
| 2628 | struct hostap_interface *iface; | 2628 | struct hostap_interface *iface; |