From f14bf5ea4f2f97650e634fa2ae4fa3c7e192cdb9 Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Tue, 2 Sep 2008 15:07:18 -0400
Subject: [PATCH] --- yaml --- r: 109432 b: refs/heads/master c:
 49898852e6aa8a6de9a5bc0bab2cf305b3583bbf h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/wireless/iwlwifi/iwl-tx.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ef389055e365..5b774d5c10c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9664741e0e2216770d6e52646474d3982b8eb55
+refs/heads/master: 49898852e6aa8a6de9a5bc0bab2cf305b3583bbf
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-tx.c b/trunk/drivers/net/wireless/iwlwifi/iwl-tx.c
index d82823b5c8ab..ff879d46624a 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-tx.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-tx.c
@@ -426,7 +426,7 @@ static int iwl_tx_queue_init(struct iwl_priv *priv,
 				continue;
 		}
 
-		txq->cmd[i] = kmalloc(len, GFP_KERNEL | GFP_DMA);
+		txq->cmd[i] = kmalloc(len, GFP_KERNEL);
 		if (!txq->cmd[i])
 			return -ENOMEM;
 	}