From 968a8985d39a8c25b45c84d4ec1db7066d5e70cc Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <lrodriguez@atheros.com>
Date: Thu, 12 Mar 2009 18:18:50 -0400
Subject: [PATCH] --- yaml --- r: 132531 b: refs/heads/master c:
 5ec905a8df3fa877566ba98298433fbfb3d688cc h: refs/heads/master i:   132529:
 65d49b1d927c8af1665330be72d4e4097270f915   132527:
 8ef94cd027650c76222785fd8f2bd5d13e278fbf v: v3

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

diff --git a/[refs] b/[refs]
index 006bff2ace23..73928df24aa4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6158425be398936af1fd04451f78ffad01529cb0
+refs/heads/master: 5ec905a8df3fa877566ba98298433fbfb3d688cc
diff --git a/trunk/drivers/net/wireless/ath9k/hw.c b/trunk/drivers/net/wireless/ath9k/hw.c
index 5c870436fc5f..c38a00bbce64 100644
--- a/trunk/drivers/net/wireless/ath9k/hw.c
+++ b/trunk/drivers/net/wireless/ath9k/hw.c
@@ -687,7 +687,8 @@ static struct ath_hal *ath9k_hw_do_attach(u16 devid, struct ath_softc *sc,
 	}
 
 	if (ah->ah_config.serialize_regmode == SER_REG_MODE_AUTO) {
-		if (ah->ah_macVersion == AR_SREV_VERSION_5416_PCI) {
+		if (ah->ah_macVersion == AR_SREV_VERSION_5416_PCI ||
+		    (AR_SREV_9280(ah) && !ah->ah_isPciExpress)) {
 			ah->ah_config.serialize_regmode =
 				SER_REG_MODE_ON;
 		} else {