From 50b1ed2a1383f2bef83944406d0c1d474f7e58ba Mon Sep 17 00:00:00 2001
From: Zhu Yi <yi.zhu@intel.com>
Date: Tue, 25 Sep 2007 19:34:09 -0700
Subject: [PATCH] --- yaml --- r: 66687 b: refs/heads/master c:
 1156b2c689bf509cdc254394598d410787a02aec h: refs/heads/master i:   66685:
 79c80006850ce337d8dca036894ec0594116d58a   66683:
 f71758dcb256e74c34571e2b1fffc011da4b9e74   66679:
 33ab07a6dd30e246e1191f181ca4bcdafb8001a2   66671:
 fac79d9f6ce54225d9d11f458a09c83073f1594c   66655:
 f17822798433747832ea8865a5d89751f91eec35   66623:
 267c727303dcbb6de15b77ad6289f69cc27a1f18   66559:
 f6416ee65f5cbf1a0df0616c9962db317483ff7c v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/net/wireless/iwlwifi/Makefile       | 6 ------
 trunk/drivers/net/wireless/iwlwifi/iwl-3945-rs.c  | 2 ++
 trunk/drivers/net/wireless/iwlwifi/iwl-3945.c     | 2 ++
 trunk/drivers/net/wireless/iwlwifi/iwl-4965-rs.c  | 2 ++
 trunk/drivers/net/wireless/iwlwifi/iwl-4965.c     | 2 ++
 trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 ++
 trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c | 2 ++
 8 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 2e1f16f3cb8e..f8cd74994986 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8236632fb3532188c75656421e29f5ab51b47db7
+refs/heads/master: 1156b2c689bf509cdc254394598d410787a02aec
diff --git a/trunk/drivers/net/wireless/iwlwifi/Makefile b/trunk/drivers/net/wireless/iwlwifi/Makefile
index 03837ff54312..3bbd38358d53 100644
--- a/trunk/drivers/net/wireless/iwlwifi/Makefile
+++ b/trunk/drivers/net/wireless/iwlwifi/Makefile
@@ -1,11 +1,5 @@
 obj-$(CONFIG_IWL3945)	+= iwl3945.o
 iwl3945-objs		= iwl3945-base.o iwl-3945.o iwl-3945-rs.o
-CFLAGS_iwl3945-base.o	= -DIWL=3945
-CFLAGS_iwl-3945.o	= -DIWL=3945
-CFLAGS_iwl-3945-rs.o	= -DIWL=3945
 
 obj-$(CONFIG_IWL4965)	+= iwl4965.o
 iwl4965-objs		= iwl4965-base.o iwl-4965.o iwl-4965-rs.o
-CFLAGS_iwl4965-base.o	= -DIWL=4965
-CFLAGS_iwl-4965.o	= -DIWL=4965
-CFLAGS_iwl-4965-rs.o	= -DIWL=4965
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-3945-rs.c b/trunk/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
index b0d28ae0b324..f4aabcf480e4 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
@@ -40,6 +40,8 @@
 #include <net/mac80211.h>
 #include <linux/wireless.h>
 
+#define IWL 3945
+
 #include "../net/mac80211/ieee80211_rate.h"
 
 #include "iwlwifi.h"
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-3945.c b/trunk/drivers/net/wireless/iwlwifi/iwl-3945.c
index 55f7d89aad8d..acb38750535f 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -40,6 +40,8 @@
 #include <linux/etherdevice.h>
 #include <linux/delay.h>
 
+#define IWL 3945
+
 #include "iwlwifi.h"
 #include "iwl-helpers.h"
 #include "iwl-3945.h"
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-4965-rs.c b/trunk/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
index 7b74481f5282..bc5e67b0b0e2 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
@@ -39,6 +39,8 @@
 #include <net/mac80211.h>
 #include <linux/wireless.h>
 
+#define IWL 4965
+
 #include "../net/mac80211/ieee80211_rate.h"
 
 #include "iwlwifi.h"
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-4965.c b/trunk/drivers/net/wireless/iwlwifi/iwl-4965.c
index e624f2a41e0e..b704fe7fca27 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -39,6 +39,8 @@
 #include <linux/etherdevice.h>
 #include <linux/delay.h>
 
+#define IWL 4965
+
 #include "iwlwifi.h"
 #include "iwl-4965.h"
 #include "iwl-helpers.h"
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c b/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c
index cc405f4a8647..44f983b6d39b 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -58,6 +58,8 @@
 
 #include <asm/div64.h>
 
+#define IWL 3945
+
 #include "iwlwifi.h"
 #include "iwl-3945.h"
 #include "iwl-helpers.h"
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c b/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c
index 6cea3118b7c1..61500a209297 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -58,6 +58,8 @@
 
 #include <asm/div64.h>
 
+#define IWL 4965
+
 #include "iwlwifi.h"
 #include "iwl-4965.h"
 #include "iwl-helpers.h"