From: Larry Finger Date: Wed, 17 Apr 2019 00:35:47 +0000 (-0500) Subject: rtlwifi: rtl8188ee: Remove extraneous file X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b5250c9c14c139f467a935a4b7edfcf202772c52;p=openwrt%2Fstaging%2Fblogic.git rtlwifi: rtl8188ee: Remove extraneous file 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 Reported-by: Andrew Morton Cc: Andrew Morton Signed-off-by: Kalle Valo --- 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)