From f94bc6be39f0018653d62a3fcc6626b131f017cf Mon Sep 17 00:00:00 2001
From: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Date: Fri, 1 Apr 2011 16:35:09 -0700
Subject: [PATCH] --- yaml --- r: 246785 b: refs/heads/master c:
 ab4bf5ef5afce9d31cf5cf05ac80b3b01cbb24a3 h: refs/heads/master i:   246783:
 817505d340ee4c20f1c75d9cb05fb2f60e3a249e v: v3

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

diff --git a/[refs] b/[refs]
index 7e0de9012a01..16ddf09df6af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ece3cd2e8fb119a4394dcdc6ef921e85cdd4cc69
+refs/heads/master: ab4bf5ef5afce9d31cf5cf05ac80b3b01cbb24a3
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-fh.h b/trunk/drivers/net/wireless/iwlwifi/iwl-fh.h
index da06d136a357..0f1052f80a53 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-fh.h
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-fh.h
@@ -424,7 +424,6 @@
 #define RX_LOW_WATERMARK 8
 
 /* Size of one Rx buffer in host DRAM */
-#define IWL_RX_BUF_SIZE_3K (3 * 1000) /* 3945 only */
 #define IWL_RX_BUF_SIZE_4K (4 * 1024)
 #define IWL_RX_BUF_SIZE_8K (8 * 1024)
 
@@ -443,7 +442,7 @@ struct iwl_rb_status {
 	__le16 closed_fr_num;
 	__le16 finished_rb_num;
 	__le16 finished_fr_nam;
-	__le32 __unused; /* 3945 only */
+	__le32 __unused;
 } __packed;