Merge branch 'master' into next

[karo-tx-linux.git] / drivers / staging / rt2860 / rt_linux.c

diff --git a/drivers/staging/rt2860/rt_linux.c b/drivers/staging/rt2860/rt_linux.c
index 10710b5aaf4b9dbd6129326f725b6977c646c540..f3c128c72a218dc9404fee31fd089fa1c5e4f3b7 100644 (file)
--- a/drivers/staging/rt2860/rt_linux.c
+++ b/drivers/staging/rt2860/rt_linux.c
@@ -48,10 +48,8 @@ BUILD_TIMER_FUNCTION(LeapAuthTimeout);
 #endif
 BUILD_TIMER_FUNCTION(StaQuickResponeForRateUpExec);
 BUILD_TIMER_FUNCTION(WpaDisassocApAndBlockAssoc);
-#ifdef RT2860
 BUILD_TIMER_FUNCTION(PsPollWakeExec);
 BUILD_TIMER_FUNCTION(RadioOnExec);
-#endif // RT2860 //
 #ifdef QOS_DLS_SUPPORT
 BUILD_TIMER_FUNCTION(DlsTimeoutAction);
 #endif // QOS_DLS_SUPPORT //
@@ -293,9 +291,7 @@ VOID        RTMPFreeAdapter(
 
        NdisFreeSpinLock(&pAd->MgmtRingLock);
 
-#ifdef RT2860
        NdisFreeSpinLock(&pAd->RxRingLock);
-#endif // RT2860 //
 
        for (index =0 ; index < NUM_OF_TX_RING; index++)
        {