* [PATCH net-2.6.24] iwlwifi: remove per-file CFLAGS for IWL define
@ 2007-09-21 3:00 Zhu Yi
2007-09-21 3:05 ` Zhu Yi
2007-09-26 2:34 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Zhu Yi @ 2007-09-21 3:00 UTC (permalink / raw)
To: David Miller, linville; +Cc: linux-wireless, Zhu Yi, Zhu Yi
From: Zhu Yi <chuyee@santarosa.sh.intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
---
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(-)
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index d5d0427..a1345c6 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -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/
diff --git a/drivers/net/wireless/iwl-3945-rs.c b/drivers/net/wireless/iwl-3945-rs.c
index b0d28ae..f4aabcf 100644
--- a/drivers/net/wireless/iwl-3945-rs.c
+++ b/drivers/net/wireless/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/iwl-3945.c b/drivers/net/wireless/iwl-3945.c
index 55f7d89..acb3875 100644
--- a/drivers/net/wireless/iwl-3945.c
+++ b/drivers/net/wireless/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/iwl-4965-rs.c b/drivers/net/wireless/iwl-4965-rs.c
index 7b74481..bc5e67b 100644
--- a/drivers/net/wireless/iwl-4965-rs.c
+++ b/drivers/net/wireless/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/iwl-4965.c b/drivers/net/wireless/iwl-4965.c
index e624f2a..b704fe7 100644
--- a/drivers/net/wireless/iwl-4965.c
+++ b/drivers/net/wireless/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/iwl3945-base.c b/drivers/net/wireless/iwl3945-base.c
index cc405f4..44f983b 100644
--- a/drivers/net/wireless/iwl3945-base.c
+++ b/drivers/net/wireless/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/iwl4965-base.c b/drivers/net/wireless/iwl4965-base.c
index 6cea311..61500a2 100644
--- a/drivers/net/wireless/iwl4965-base.c
+++ b/drivers/net/wireless/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"
--
1.5.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net-2.6.24] iwlwifi: remove per-file CFLAGS for IWL define
2007-09-21 3:00 [PATCH net-2.6.24] iwlwifi: remove per-file CFLAGS for IWL define Zhu Yi
@ 2007-09-21 3:05 ` Zhu Yi
2007-09-26 2:34 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Zhu Yi @ 2007-09-21 3:05 UTC (permalink / raw)
To: David Miller; +Cc: linville, linux-wireless
On Fri, 2007-09-21 at 11:00 +0800, Zhu Yi wrote:
> From: Zhu Yi <chuyee@santarosa.sh.intel.com>
This is from a development box and not reachable externally. Please
replace it with Zhu Yi <yi.zhu@intel.com>.
Thanks,
-yi
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-2.6.24] iwlwifi: remove per-file CFLAGS for IWL define
2007-09-21 3:00 [PATCH net-2.6.24] iwlwifi: remove per-file CFLAGS for IWL define Zhu Yi
2007-09-21 3:05 ` Zhu Yi
@ 2007-09-26 2:34 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2007-09-26 2:34 UTC (permalink / raw)
To: yi.zhu; +Cc: linville, linux-wireless, chuyee
From: Zhu Yi <yi.zhu@intel.com>
Date: Fri, 21 Sep 2007 11:00:50 +0800
> From: Zhu Yi <chuyee@santarosa.sh.intel.com>
>
> Signed-off-by: Zhu Yi <yi.zhu@intel.com>
I modified this to apply to my net-2.6.24 rebase where I moved
everything into a iwlwifi/ subdirectory.
Thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-09-26 2:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-09-21 3:00 [PATCH net-2.6.24] iwlwifi: remove per-file CFLAGS for IWL define Zhu Yi
2007-09-21 3:05 ` Zhu Yi
2007-09-26 2:34 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).