diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-10-11 15:35:42 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-10-11 15:35:42 -0400 |
| commit | 094daf7db7c47861009899ce23f9177d761e20b0 (patch) | |
| tree | a107065393720b80664157a035b206576e834793 /drivers/net/wireless/b43legacy/main.c | |
| parent | 3ed6f6958c0ac21958285d8648f14d34da4bbcb3 (diff) | |
| parent | 5f68a2b0a890d086e40fc7b55f4a0c32c28bc0d2 (diff) | |
Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem
Conflicts:
Documentation/feature-removal-schedule.txt
Diffstat (limited to 'drivers/net/wireless/b43legacy/main.c')
| -rw-r--r-- | drivers/net/wireless/b43legacy/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c index 468d1836548e..a3b72cd72c66 100644 --- a/drivers/net/wireless/b43legacy/main.c +++ b/drivers/net/wireless/b43legacy/main.c | |||
| @@ -2466,7 +2466,8 @@ out: | |||
| 2466 | } | 2466 | } |
| 2467 | } | 2467 | } |
| 2468 | 2468 | ||
| 2469 | static int b43legacy_op_conf_tx(struct ieee80211_hw *hw, u16 queue, | 2469 | static int b43legacy_op_conf_tx(struct ieee80211_hw *hw, |
| 2470 | struct ieee80211_vif *vif, u16 queue, | ||
| 2470 | const struct ieee80211_tx_queue_params *params) | 2471 | const struct ieee80211_tx_queue_params *params) |
| 2471 | { | 2472 | { |
| 2472 | return 0; | 2473 | return 0; |