diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-10-21 11:46:04 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-10-21 11:46:04 -0400 |
| commit | 513b046c96cc2fbce730a3474f6f7ff0c4fdd05c (patch) | |
| tree | e8006368b6f643067486f92405a404757807d6da /drivers/net/wireless/wavelan.p.h | |
| parent | 82810b7b6cc7a74c68881a13b0eb66c7a6370fcc (diff) | |
| parent | c7a3bd177f248d01ee18a01d22048c80e071c331 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/wireless/wavelan.p.h')
| -rw-r--r-- | drivers/net/wireless/wavelan.p.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/wavelan.p.h b/drivers/net/wireless/wavelan.p.h index 5cb0bc8bb128..72b646c77d5a 100644 --- a/drivers/net/wireless/wavelan.p.h +++ b/drivers/net/wireless/wavelan.p.h | |||
| @@ -642,8 +642,7 @@ static int | |||
| 642 | /* ---------------------- INTERRUPT HANDLING ---------------------- */ | 642 | /* ---------------------- INTERRUPT HANDLING ---------------------- */ |
| 643 | static irqreturn_t | 643 | static irqreturn_t |
| 644 | wavelan_interrupt(int, /* interrupt handler */ | 644 | wavelan_interrupt(int, /* interrupt handler */ |
| 645 | void *, | 645 | void *); |
| 646 | struct pt_regs *); | ||
| 647 | static void | 646 | static void |
| 648 | wavelan_watchdog(struct net_device *); /* transmission watchdog */ | 647 | wavelan_watchdog(struct net_device *); /* transmission watchdog */ |
| 649 | /* ------------------- CONFIGURATION CALLBACKS ------------------- */ | 648 | /* ------------------- CONFIGURATION CALLBACKS ------------------- */ |