Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=1156b2c689bf509cdc254394598d410787a02aec
Commit: 1156b2c689bf509cdc254394598d410787a02aec
Parent: 8236632fb3532188c75656421e29f5ab51b47db7
Author: Zhu Yi <[EMAIL PROTECTED]>
AuthorDate: Tue Sep 25 19:34:09 2007 -0700
Committer: David S. Miller <[EMAIL PROTECTED]>
CommitDate: Wed Oct 10 16:52:16 2007 -0700
[IWLWIFI]: remove per-file CFLAGS for IWL define
Signed-off-by: Zhu Yi <[EMAIL PROTECTED]>
Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
drivers/net/wireless/iwlwifi/Makefile | 6 ------
drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 2 ++
drivers/net/wireless/iwlwifi/iwl-3945.c | 2 ++
drivers/net/wireless/iwlwifi/iwl-4965-rs.c | 2 ++
drivers/net/wireless/iwlwifi/iwl-4965.c | 2 ++
drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 ++
drivers/net/wireless/iwlwifi/iwl4965-base.c | 2 ++
7 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/Makefile
b/drivers/net/wireless/iwlwifi/Makefile
index 03837ff..3bbd383 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 b0d28ae..f4aabcf 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 55f7d89..acb3875 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 7b74481..bc5e67b 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 e624f2a..b704fe7 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 cc405f4..44f983b 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 6cea311..61500a2 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"
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
