From 7859e9fa75cc5e3bfcfdfd94d4578196daa1b827 Mon Sep 17 00:00:00 2001
From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Mon, 4 Jan 2010 21:54:25 +0100
Subject: [PATCH] --- yaml --- r: 183549 b: refs/heads/master c:
 9a2303b93039d0f3dd578cd75fe20ebaf075f1cb h: refs/heads/master i:   183547:
 07e96dd50984cd42efd574e3acbdfe1f953df9f3 v: v3

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

diff --git a/[refs] b/[refs]
index f3d67fee52e2..9960b2b00f04 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 153458ff7ed5949cd5b07a2355a34aad9891ad98
+refs/heads/master: 9a2303b93039d0f3dd578cd75fe20ebaf075f1cb
diff --git a/trunk/drivers/net/wireless/mwl8k.c b/trunk/drivers/net/wireless/mwl8k.c
index 2c286d18bae3..46a5cf214a20 100644
--- a/trunk/drivers/net/wireless/mwl8k.c
+++ b/trunk/drivers/net/wireless/mwl8k.c
@@ -1269,8 +1269,8 @@ static int mwl8k_tx_wait_empty(struct ieee80211_hw *hw)
 		}
 
 		if (priv->pending_tx_pkts < oldcount) {
-			printk(KERN_NOTICE "%s: timeout waiting for tx "
-			       "rings to drain (%d -> %d pkts), retrying\n",
+			printk(KERN_NOTICE "%s: waiting for tx rings "
+			       "to drain (%d -> %d pkts)\n",
 			       wiphy_name(hw->wiphy), oldcount,
 			       priv->pending_tx_pkts);
 			retry = 1;