diff options
| author | David S. Miller <davem@davemloft.net> | 2011-10-11 15:39:21 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-10-11 15:39:21 -0400 |
| commit | 9687c637388f63b87fcc18eee6e65bcfca4f49ca (patch) | |
| tree | 0929bb8dc602c4f86b6b2e95bca94015de2b0868 /drivers/net/wireless/wl1251 | |
| parent | 258daca2bc9f97ace65c9480c901fddfce1e20cf (diff) | |
| parent | 094daf7db7c47861009899ce23f9177d761e20b0 (diff) | |
Merge branch 'for-davem' of git://git.infradead.org/users/linville/wireless-next
Diffstat (limited to 'drivers/net/wireless/wl1251')
| -rw-r--r-- | drivers/net/wireless/wl1251/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl1251/main.c b/drivers/net/wireless/wl1251/main.c index a14a48c99cdc..ba3268ea81fe 100644 --- a/drivers/net/wireless/wl1251/main.c +++ b/drivers/net/wireless/wl1251/main.c | |||
| @@ -1158,7 +1158,8 @@ static struct ieee80211_channel wl1251_channels[] = { | |||
| 1158 | { .hw_value = 13, .center_freq = 2472}, | 1158 | { .hw_value = 13, .center_freq = 2472}, |
| 1159 | }; | 1159 | }; |
| 1160 | 1160 | ||
| 1161 | static int wl1251_op_conf_tx(struct ieee80211_hw *hw, u16 queue, | 1161 | static int wl1251_op_conf_tx(struct ieee80211_hw *hw, |
| 1162 | struct ieee80211_vif *vif, u16 queue, | ||
| 1162 | const struct ieee80211_tx_queue_params *params) | 1163 | const struct ieee80211_tx_queue_params *params) |
| 1163 | { | 1164 | { |
| 1164 | enum wl1251_acx_ps_scheme ps_scheme; | 1165 | enum wl1251_acx_ps_scheme ps_scheme; |