diff options
author | David S. Miller <davem@davemloft.net> | 2009-08-21 01:56:56 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-08-21 01:56:56 -0700 |
commit | f8f2109d4f6c525f893f6f2901ae62372e83245e (patch) | |
tree | e20b095973d45eb2360ffa157ad161536c2ddbe9 /drivers/net/wireless/b43/main.h | |
parent | bb81b2ddfa194b6d12761a350b5b5985cecae0a9 (diff) | |
parent | a2c3f6567c9ac327f1ef1272551f3a7595ec885e (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/b43/main.h')
-rw-r--r-- | drivers/net/wireless/b43/main.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/main.h b/drivers/net/wireless/b43/main.h index 950fb1b0546..0406e06781d 100644 --- a/drivers/net/wireless/b43/main.h +++ b/drivers/net/wireless/b43/main.h @@ -123,7 +123,7 @@ void __b43_shm_write16(struct b43_wldev *dev, u16 routing, u16 offset, u16 value u64 b43_hf_read(struct b43_wldev *dev); void b43_hf_write(struct b43_wldev *dev, u64 value); -void b43_dummy_transmission(struct b43_wldev *dev); +void b43_dummy_transmission(struct b43_wldev *dev, bool ofdm, bool pa_on); void b43_wireless_core_reset(struct b43_wldev *dev, u32 flags); |