summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorZhu Yi <yi.zhu@intel.com>2007-09-25 19:34:09 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 16:52:16 -0700
commit1156b2c689bf509cdc254394598d410787a02aec (patch)
tree2380d36002c1bcf6ced6401947614e1603d54a6d /drivers
parent8236632fb3532188c75656421e29f5ab51b47db7 (diff)
[IWLWIFI]: remove per-file CFLAGS for IWL define
Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/iwlwifi/Makefile6
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-3945-rs.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-3945.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-4965-rs.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-4965.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl4965-base.c2
7 files changed, 12 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/Makefile b/drivers/net/wireless/iwlwifi/Makefile
index 03837ff5431..3bbd38358d5 100644
--- a/drivers/net/wireless/iwlwifi/Makefile
+++ b/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/drivers/net/wireless/iwlwifi/iwl-3945-rs.c b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
index b0d28ae0b32..f4aabcf480e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
+++ b/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/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index 55f7d89aad8..acb38750535 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/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/drivers/net/wireless/iwlwifi/iwl-4965-rs.c b/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
index 7b74481f528..bc5e67b0b0e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
+++ b/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/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index e624f2a41e0..b704fe7fca2 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/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/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index cc405f4a864..44f983b6d39 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/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/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index 6cea3118b7c..61500a20929 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/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"