[IWLWIFI]: remove per-file CFLAGS for IWL define
authorZhu Yi <yi.zhu@intel.com>
Wed, 26 Sep 2007 02:34:09 +0000 (19:34 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Wed, 10 Oct 2007 23:52:16 +0000 (16:52 -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 03837ff54312beb4a035a6d420fd091024514b24..3bbd38358d5341f0c009c2605f851474fcf18db7 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 b0d28ae0b324e34698e0641e24c7e28a8114b0ef..f4aabcf480e46636479ebf00fc4f9d70b95f5ebf 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 55f7d89aad8d7de6995db6a39fade7fb5fffb437..acb38750535f549b72fabfd0ddf2de3e1fc53e56 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 7b74481f52827e940f11e2c3539155071656387f..bc5e67b0b0e271eceda10209f97b7c2bde9fb52e 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 e624f2a41e0e4ac666d80fc1867b56662c093401..b704fe7fca271d4e2d4376f3928ac77e4261ae91 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 cc405f4a864794bb64a5cd03a3abfbfd340307a1..44f983b6d39b9cd881ea318e61ec3dc517af77da 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 6cea3118b7c1da0b32cfdba20624296572a4e69f..61500a209297fc387389f2b01e1a4e100a288255 100644 (file)
@@ -58,6 +58,8 @@
 
 #include <asm/div64.h>
 
+#define IWL 4965
+
 #include "iwlwifi.h"
 #include "iwl-4965.h"
 #include "iwl-helpers.h"