diff --git a/[refs] b/[refs] index 4b5a31777ed9..c21e221afb03 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b83f4e15e65d94f6f56924b0b06a77a7ca2b4d8a +refs/heads/master: 553381c430f0e65e87ed1b5cee841a04c8a47b58 diff --git a/trunk/drivers/net/wireless/b43legacy/dma.h b/trunk/drivers/net/wireless/b43legacy/dma.h index 67537a7495ff..2f186003c31e 100644 --- a/trunk/drivers/net/wireless/b43legacy/dma.h +++ b/trunk/drivers/net/wireless/b43legacy/dma.h @@ -321,8 +321,7 @@ void b43legacy_dma_get_tx_stats(struct b43legacy_wldev *dev, } static inline int b43legacy_dma_tx(struct b43legacy_wldev *dev, - struct sk_buff *skb, - struct ieee80211_tx_control *ctl) + struct sk_buff *skb) { return 0; } diff --git a/trunk/drivers/net/wireless/b43legacy/pio.h b/trunk/drivers/net/wireless/b43legacy/pio.h index 49310dfaf2d1..464fec05a06d 100644 --- a/trunk/drivers/net/wireless/b43legacy/pio.h +++ b/trunk/drivers/net/wireless/b43legacy/pio.h @@ -130,8 +130,7 @@ void b43legacy_pio_free(struct b43legacy_wldev *dev) } static inline int b43legacy_pio_tx(struct b43legacy_wldev *dev, - struct sk_buff *skb, - struct ieee80211_tx_control *ctl) + struct sk_buff *skb) { return 0; }