From 095b8d298835784532afca42eae757aee8d0882f Mon Sep 17 00:00:00 2001
From: Jiri Benc <jbenc@suse.cz>
Date: Thu, 25 Aug 2005 20:09:39 -0400
Subject: [PATCH] --- yaml --- r: 6787 b: refs/heads/master c:
 8d45ff7d7bd85d9066f5b498cda5c4a52ac36a7f h: refs/heads/master i:   6785:
 03dfab46308da5f7702013062261855092b5753e   6783:
 9ffc87e7b61804cd8fd13c521c9ba55ee75035ea v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/net/wireless/ipw2200.c |  2 +-
 trunk/drivers/net/wireless/ipw2200.h | 10 +---------
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 7e17d6e17d00..58b7ce949baf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 771abed990d8642f289f733dc0fa8a395ab31ca1
+refs/heads/master: 8d45ff7d7bd85d9066f5b498cda5c4a52ac36a7f
diff --git a/trunk/drivers/net/wireless/ipw2200.c b/trunk/drivers/net/wireless/ipw2200.c
index fe328671192d..6d0b6b1df4ca 100644
--- a/trunk/drivers/net/wireless/ipw2200.c
+++ b/trunk/drivers/net/wireless/ipw2200.c
@@ -4485,7 +4485,7 @@ static void ipw_debug_config(struct ipw_priv *priv)
 	IPW_DEBUG_INFO("RATE MASK: 0x%08X\n", priv->rates_mask);
 }
 #else
-#define ipw_debug_config(x) do {} while (0);
+#define ipw_debug_config(x) do {} while (0)
 #endif
 
 static inline void ipw_set_fixed_rate(struct ipw_priv *priv,
diff --git a/trunk/drivers/net/wireless/ipw2200.h b/trunk/drivers/net/wireless/ipw2200.h
index 746bcdb1c297..3bff09d93154 100644
--- a/trunk/drivers/net/wireless/ipw2200.h
+++ b/trunk/drivers/net/wireless/ipw2200.h
@@ -73,8 +73,6 @@ enum connection_manager_assoc_states
 };
 
 
-#define IPW_NORMAL                   0
-#define IPW_NOWAIT                   0
 #define IPW_WAIT                     (1<<0)
 #define IPW_QUIET                    (1<<1)
 #define IPW_ROAMING                  (1<<2)
@@ -180,7 +178,7 @@ enum connection_manager_assoc_states
 
 /* even if MAC WEP set (allows pre-encrypt) */
 #define DCT_FLAG_NO_WEP              0x20
-#define IPW_
+
 /* overwrite TSF field */
 #define DCT_FLAG_TSF_REQD                  0x40
 
@@ -513,12 +511,6 @@ struct notif_authenticate {
 	u16 status;
 } __attribute__ ((packed));
 
-struct temperature
-{
-	s32 measured;
-	s32 active;
-} __attribute__ ((packed));
-
 struct notif_calibration {
 	u8 data[104];
 } __attribute__ ((packed));