Messages in this thread | | | Date | Mon, 30 Sep 2013 09:26:15 -0500 | From | Larry Finger <> | Subject | Re: linux-next: manual merge of the wireless-next tree |
| |
On 09/30/2013 06:26 AM, Thierry Reding wrote: > Today's linux-next merge of the wireless-next tree got conflicts in > > drivers/net/wireless/rtlwifi/rtl8192ce/phy.h > > I fixed it up (see below). Please check if the resolution looks correct. > > Thanks, > Thierry > --- > diff --cc drivers/net/wireless/rtlwifi/rtl8192ce/phy.h > index f8973e5,80a0893..bb319b0 > --- a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.h > +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.h > @@@ -217,10 -222,10 +215,9 @@@ void _rtl92ce_phy_lc_calibrate(struct i > void rtl92c_phy_set_rfpath_switch(struct ieee80211_hw *hw, bool bmain); > bool rtl92c_phy_config_rf_with_headerfile(struct ieee80211_hw *hw, > enum radio_path rfpath); > -bool rtl8192_phy_check_is_legal_rfpath(struct ieee80211_hw *hw, > - u32 rfpath); > +bool rtl8192_phy_check_is_legal_rfpath(struct ieee80211_hw *hw, u32 rfpath); > - bool rtl92c_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype); > bool rtl92ce_phy_set_rf_power_state(struct ieee80211_hw *hw, > - enum rf_pwrstate rfpwr_state); > + enum rf_pwrstate rfpwr_state); > void rtl92ce_phy_set_rf_on(struct ieee80211_hw *hw); > bool rtl92c_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype); > void rtl92c_phy_set_io(struct ieee80211_hw *hw);
Thierry,
Yes, your fix is correct.
Larry
| |