Skip to contentSkip to conversation

iwlwifi: remove per-file CFLAGS for IWL define

PATCH In review Zhu Yi 2 participants 3 messages Sep 21, 2007 – Sep 26, 2007 Networking drivers (wireless)

lore
Share & tools
lore

Zhu Yi

author
#0 lore raw

PATCH 1/1 iwlwifi: remove per-file CFLAGS for IWL define

From: Zhu Yi <[email protected]>

Signed-off-by Zhu Yi <[email protected]>
---
 drivers/net/wireless/Makefile       |    6 ------
 drivers/net/wireless/iwl-3945-rs.c  |    2 ++
 drivers/net/wireless/iwl-3945.c     |    2 ++
 drivers/net/wireless/iwl-4965-rs.c  |    2 ++
 drivers/net/wireless/iwl-4965.c     |    2 ++
 drivers/net/wireless/iwl3945-base.c |    2 ++
 drivers/net/wireless/iwl4965-base.c |    2 ++
 7 files changed, 12 insertions(+), 6 deletions(-)
drivers/net/wireless/Makefile +0 -6
index d5d0427..a1345c6 100644
@@ -55,15 +55,9 @@ obj-$(CONFIG_ADM8211)	+= adm8211.o
 
 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
 
 obj-$(CONFIG_RT2X00)		+= rt2x00/
drivers/net/wireless/iwl-3945-rs.c +2 -0
index b0d28ae..f4aabcf 100644
@@ -40,6 +40,8 @@
 #include <net/mac80211.h>
 #include <linux/wireless.h>
 
+#define IWL 3945
+
 #include "../net/mac80211/ieee80211_rate.h"
 
 #include "iwlwifi.h"
drivers/net/wireless/iwl-3945.c +2 -0
index 55f7d89..acb3875 100644
@@ -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"
drivers/net/wireless/iwl-4965-rs.c +2 -0
index 7b74481..bc5e67b 100644
@@ -39,6 +39,8 @@
 #include <net/mac80211.h>
 #include <linux/wireless.h>
 
+#define IWL 4965
+
 #include "../net/mac80211/ieee80211_rate.h"
 
 #include "iwlwifi.h"
drivers/net/wireless/iwl-4965.c +2 -0
index e624f2a..b704fe7 100644
@@ -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"
drivers/net/wireless/iwl3945-base.c +2 -0
index cc405f4..44f983b 100644
@@ -58,6 +58,8 @@
 
 #include <asm/div64.h>
 
+#define IWL 3945
+
 #include "iwlwifi.h"
 #include "iwl-3945.h"
 #include "iwl-helpers.h"
drivers/net/wireless/iwl4965-base.c +2 -0
index 6cea311..61500a2 100644
@@ -58,6 +58,8 @@
 
 #include <asm/div64.h>
 
+#define IWL 4965
+
 #include "iwlwifi.h"
 #include "iwl-4965.h"
 #include "iwl-helpers.h"
Signature · 1 line
1.5.1