diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-10-20 05:04:50 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-10-20 05:04:50 +0200 |
| commit | fe2520094d88018423dfc42b3cd0015f74e8adea (patch) | |
| tree | 859b78d64961ad92873e835ad1520caeb34b292f /drivers/net/wireless/b43/main.c | |
| parent | Fix build break in tsi108.c (diff) | |
| parent | [PATCH] rt2x00: Add new rt73usb USB ID (diff) | |
| download | linux-fe2520094d88018423dfc42b3cd0015f74e8adea.tar.xz linux-fe2520094d88018423dfc42b3cd0015f74e8adea.zip | |
Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
Diffstat (limited to 'drivers/net/wireless/b43/main.c')
| -rw-r--r-- | drivers/net/wireless/b43/main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index c141a264ac45..9d9ff76a9bc6 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c @@ -49,7 +49,6 @@ #include "pio.h" #include "sysfs.h" #include "xmit.h" -#include "sysfs.h" #include "lo.h" #include "pcmcia.h" @@ -3495,7 +3494,7 @@ static int b43_start(struct ieee80211_hw *hw) struct b43_wl *wl = hw_to_b43_wl(hw); struct b43_wldev *dev = wl->current_dev; int did_init = 0; - int err; + int err = 0; mutex_lock(&wl->mutex); @@ -3521,7 +3520,7 @@ static int b43_start(struct ieee80211_hw *hw) return err; } -void b43_stop(struct ieee80211_hw *hw) +static void b43_stop(struct ieee80211_hw *hw) { struct b43_wl *wl = hw_to_b43_wl(hw); struct b43_wldev *dev = wl->current_dev; |