From c0de4255981fe43c455e714b0ba8aca0d53679cc Mon Sep 17 00:00:00 2001
From: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Date: Wed, 21 Jan 2009 19:24:13 +0530
Subject: [PATCH] --- yaml --- r: 134204 b: refs/heads/master c:
 369391db1aabd089cefaadaabb6d9fc82e78b0a7 h: refs/heads/master v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/net/wireless/ath9k/hw.c | 14 ++------------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 937ed1a7dfc7..ab7fb64f6ce4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6799cc2e8c755a0317e664f29de0b08ddd0eb35
+refs/heads/master: 369391db1aabd089cefaadaabb6d9fc82e78b0a7
diff --git a/trunk/drivers/net/wireless/ath9k/hw.c b/trunk/drivers/net/wireless/ath9k/hw.c
index baa7a7e47c2b..65e0d80f3b4d 100644
--- a/trunk/drivers/net/wireless/ath9k/hw.c
+++ b/trunk/drivers/net/wireless/ath9k/hw.c
@@ -2255,18 +2255,8 @@ int ath9k_hw_reset(struct ath_hal *ah, struct ath9k_channel *chan,
 		return -EINVAL;
 	}
 
-	if (AR_SREV_9280_10_OR_LATER(ah)) {
-		REG_SET_BIT(ah, AR_GPIO_INPUT_EN_VAL,
-			    AR_GPIO_JTAG_DISABLE);
-
-		if (test_bit(ATH9K_MODE_11A, ah->ah_caps.wireless_modes)) {
-			if (IS_CHAN_5GHZ(chan))
-				ath9k_hw_set_gpio(ah, 9, 0);
-			else
-				ath9k_hw_set_gpio(ah, 9, 1);
-		}
-		ath9k_hw_cfg_output(ah, 9, AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
-	}
+	if (AR_SREV_9280_10_OR_LATER(ah))
+		REG_SET_BIT(ah, AR_GPIO_INPUT_EN_VAL, AR_GPIO_JTAG_DISABLE);
 
 	r = ath9k_hw_process_ini(ah, chan, sc->tx_chan_width);
 	if (r)