[IWLWIFI]: remove per-file CFLAGS for IWL define
Zhu Yi [Wed, 26 Sep 2007 02:34:09 +0000 (19:34 -0700)]
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

drivers/net/wireless/iwlwifi/Makefile
drivers/net/wireless/iwlwifi/iwl-3945-rs.c
drivers/net/wireless/iwlwifi/iwl-3945.c
drivers/net/wireless/iwlwifi/iwl-4965-rs.c
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/wireless/iwlwifi/iwl4965-base.c

index 03837ff..3bbd383 100644 (file)
@@ -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
index b0d28ae..f4aabcf 100644 (file)
@@ -40,6 +40,8 @@
 #include <net/mac80211.h>
 #include <linux/wireless.h>
 
+#define IWL 3945
+
 #include "../net/mac80211/ieee80211_rate.h"
 
 #include "iwlwifi.h"
index 55f7d89..acb3875 100644 (file)
@@ -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"
index 7b74481..bc5e67b 100644 (file)
@@ -39,6 +39,8 @@
 #include <net/mac80211.h>
 #include <linux/wireless.h>
 
+#define IWL 4965
+
 #include "../net/mac80211/ieee80211_rate.h"
 
 #include "iwlwifi.h"
index e624f2a..b704fe7 100644 (file)
@@ -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"
index cc405f4..44f983b 100644 (file)
@@ -58,6 +58,8 @@
 
 #include <asm/div64.h>
 
+#define IWL 3945
+
 #include "iwlwifi.h"
 #include "iwl-3945.h"
 #include "iwl-helpers.h"
index 6cea311..61500a2 100644 (file)
@@ -58,6 +58,8 @@
 
 #include <asm/div64.h>
 
+#define IWL 4965
+
 #include "iwlwifi.h"
 #include "iwl-4965.h"
 #include "iwl-helpers.h"