diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
| commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
| tree | d0536e4da737900fa27b235f175a3d179d692200 /drivers/net/wireless/wavelan_cs.p.h | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/net/wireless/wavelan_cs.p.h')
| -rw-r--r-- | drivers/net/wireless/wavelan_cs.p.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/wavelan_cs.p.h b/drivers/net/wireless/wavelan_cs.p.h index f34a36b0c7b0..4d1c4905c749 100644 --- a/drivers/net/wireless/wavelan_cs.p.h +++ b/drivers/net/wireless/wavelan_cs.p.h | |||
| @@ -738,8 +738,7 @@ static void | |||
| 738 | /* ---------------------- INTERRUPT HANDLING ---------------------- */ | 738 | /* ---------------------- INTERRUPT HANDLING ---------------------- */ |
| 739 | static irqreturn_t | 739 | static irqreturn_t |
| 740 | wavelan_interrupt(int, /* Interrupt handler */ | 740 | wavelan_interrupt(int, /* Interrupt handler */ |
| 741 | void *, | 741 | void *); |
| 742 | struct pt_regs *); | ||
| 743 | static void | 742 | static void |
| 744 | wavelan_watchdog(struct net_device *); /* Transmission watchdog */ | 743 | wavelan_watchdog(struct net_device *); /* Transmission watchdog */ |
| 745 | /* ------------------- CONFIGURATION CALLBACKS ------------------- */ | 744 | /* ------------------- CONFIGURATION CALLBACKS ------------------- */ |