diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-04-12 14:25:14 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-04-12 14:41:59 -0400 |
| commit | 7eab0f64a9eba5405222fdef0ede2468bf495efd (patch) | |
| tree | ec99640b8d0b12adbfacb85c27683125debd14f2 /drivers/net/wireless/rtlwifi/rc.c | |
| parent | cade455596504fae8e134a27189713ddf7c6d04d (diff) | |
| parent | 8065248069097dddf9945acfb2081025e9618c16 (diff) | |
Merge branch 'master' into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/iwl-testmode.c
net/wireless/nl80211.c
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rc.c')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/rc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/rtlwifi/rc.c b/drivers/net/wireless/rtlwifi/rc.c index c66f08a0524..d5cbf01da8a 100644 --- a/drivers/net/wireless/rtlwifi/rc.c +++ b/drivers/net/wireless/rtlwifi/rc.c @@ -225,8 +225,7 @@ static void rtl_rate_init(void *ppriv, static void rtl_rate_update(void *ppriv, struct ieee80211_supported_band *sband, struct ieee80211_sta *sta, void *priv_sta, - u32 changed, - enum nl80211_channel_type oper_chan_type) + u32 changed) { } |