From fe265a5718f694fa81c5a446a0c079158b7d2ec1 Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Wed, 28 Jul 2010 10:06:35 -0400
Subject: [PATCH] --- yaml --- r: 203931 b: refs/heads/master c:
 4c85ab11ca56da1aa59b58c80cc6a356515cc645 h: refs/heads/master i:   203929:
 2fff38601f6d055d66ce187187e1c8c4b9864ea1   203927:
 2dfffc02359078672b12bf69a32ad7ff97b5914f v: v3

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

diff --git a/[refs] b/[refs]
index 96b6e6c3daae..a3a6d40ab3ad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4552124543141debf40a94b67155e57aa6bb34d6
+refs/heads/master: 4c85ab11ca56da1aa59b58c80cc6a356515cc645
diff --git a/trunk/drivers/net/wireless/ath/ath9k/hw.c b/trunk/drivers/net/wireless/ath/ath9k/hw.c
index 2f83f975b891..8d291ccf5c88 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/hw.c
+++ b/trunk/drivers/net/wireless/ath/ath9k/hw.c
@@ -532,7 +532,8 @@ static int __ath9k_hw_init(struct ath_hw *ah)
 
 	if (ah->config.serialize_regmode == SER_REG_MODE_AUTO) {
 		if (ah->hw_version.macVersion == AR_SREV_VERSION_5416_PCI ||
-		    (AR_SREV_9280(ah) && !ah->is_pciexpress)) {
+		    ((AR_SREV_9160(ah) || AR_SREV_9280(ah)) &&
+		     !ah->is_pciexpress)) {
 			ah->config.serialize_regmode =
 				SER_REG_MODE_ON;
 		} else {