Somehow file drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej was incorporated into the sources. Obviously, it can be removed.
Signed-off-by: Larry Finger <larry.fin...@lwfinger.net> Reported-by: Andrew Morton <a...@linux-foundation.org> Cc: Andrew Morton <a...@linux-foundation.org> --- Andrew, Thanks. Larry --- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej deleted file mode 100644 index aa03d4605d8c..000000000000 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej +++ /dev/null @@ -1,10 +0,0 @@ ---- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c -+++ drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c -@@ -373,6 +373,7 @@ bool rtl88ee_rx_query_desc(struct ieee80211_hw *hw, - struct rx_fwinfo_88e *p_drvinfo; - struct ieee80211_hdr *hdr; - u32 phystatus = GET_RX_DESC_PHYST(pdesc); -+ u8 wake_match; - - status->packet_report_type = (u8)GET_RX_STATUS_DESC_RPT_SEL(pdesc); - if (status->packet_report_type == TX_REPORT2) -- 2.16.4
