summaryrefslogtreecommitdiff
path: root/drivers/staging/rtl8192e/rtllib_rx.c
diff options
context:
space:
mode:
authorLarry Finger <Larry.Finger@lwfinger.net>2011-07-12 21:54:48 -0500
committerLarry Finger <Larry.Finger@lwfinger.net>2011-08-23 20:22:55 -0500
commit34a7eb3db27f3bcb6e1544523e283a9bf6acfd0d (patch)
tree5c2dbed80adfe7183f5212749d6cf05670661181 /drivers/staging/rtl8192e/rtllib_rx.c
parent6e1acf20a7a17ef7f0442ab0a2da640477720424 (diff)
staging: rtl8192e: Remove dead code inside 'ifdef MERGE_TO_DO'
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Diffstat (limited to 'drivers/staging/rtl8192e/rtllib_rx.c')
-rw-r--r--drivers/staging/rtl8192e/rtllib_rx.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c
index 96f824ba8129..7e0fabad64d4 100644
--- a/drivers/staging/rtl8192e/rtllib_rx.c
+++ b/drivers/staging/rtl8192e/rtllib_rx.c
@@ -894,9 +894,6 @@ rtllib_FlushRxTsPendingPkts(struct rtllib_device *ieee, PRX_TS_RECORD pTS)
rtllib_indicate_packets(ieee, RfdArray, RfdCnt);
pTS->RxIndicateSeq = 0xffff;
-
-#ifdef MERGE_TO_DO
-#endif
}