From e49ead5b6b82c3a009bd459b424100bd2c26fbc8 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Sun, 23 Aug 2009 15:30:43 +0200
Subject: [PATCH] --- yaml --- r: 162457 b: refs/heads/master c:
 375d662f9fbbc177485f6f6ce030fc0eb622f3d3 h: refs/heads/master i:   162455:
 9bae6338c1c9ae4f43923f03c2baa3a006b4469a v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/staging/rt2860/common/mlme.c | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 05c1c294dac0..e9018a4a863e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a93e4e1aa8c4f65f455456bc2bb1bcb306ac0f1
+refs/heads/master: 375d662f9fbbc177485f6f6ce030fc0eb622f3d3
diff --git a/trunk/drivers/staging/rt2860/common/mlme.c b/trunk/drivers/staging/rt2860/common/mlme.c
index b4c98f160a64..da026eadafd8 100644
--- a/trunk/drivers/staging/rt2860/common/mlme.c
+++ b/trunk/drivers/staging/rt2860/common/mlme.c
@@ -5756,7 +5756,6 @@ VOID AsicSwitchChannel(
 	RTMP_RF_REGS *RFRegTable;
 
 	// Search Tx power value
-#ifdef RT30xx
 	// We can't use ChannelList to search channel, since some central channl's txpowr doesn't list
 	// in ChannelList, so use TxPower array instead.
 	//
@@ -5769,17 +5768,6 @@ VOID AsicSwitchChannel(
 			break;
 		}
 	}
-#else
-	for (index = 0; index < pAd->ChannelListNum; index++)
-	{
-		if (Channel == pAd->ChannelList[index].Channel)
-		{
-			TxPwer = pAd->ChannelList[index].Power;
-			TxPwer2 = pAd->ChannelList[index].Power2;
-			break;
-		}
-	}
-#endif
 
 	if (index == MAX_NUM_OF_CHANNELS)
 		DBGPRINT(RT_DEBUG_ERROR, ("AsicSwitchChannel: Can't find the Channel#%d \n", Channel));