iwlwifi: Fix built-in compilation of iwlcore
PATCH 1/1 iwlwifi: Fix built-in compilation of iwlcore
This patch fixes problem in Makefile that prevented built-in compilation of iwlcore
Commit that caused this problem: eadd3c4b
--- drivers/net/wireless/iwlwifi/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/wireless/iwlwifi/Makefile +1 -1
@@ -1,4 +1,4 @@ -obj-$(CONFIG_IWLCORE) := iwlcore.o +obj-$(CONFIG_IWLCORE) += iwlcore.o iwlcore-objs := iwl-core.o iwl-eeprom.o iwl-hcmd.o iwl-power.o iwlcore-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o iwlcore-$(CONFIG_IWLWIFI_LEDS) += iwl-led.o
Signature · 9 lines
1.5.4.1 --------------------------------------------------------------------- Intel Israel (74) Limited This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.
From: Tomas Winkler <[email protected]>
Date: Wed, 23 Apr 2008 13:38:41 +0300
[ John Linville's email was corrupted in the CC: line, fixed. ]
Quoted 4 lines
This patch fixes problem in
Makefilethat prevented built-in compilation of iwlcoreCommit that caused this problem:
eadd3c4b
Please provide the header line tead of commits, don't just reference them as SHA IDs, because SHA IDs change when patches are ported and applied to other GIT trees.
When applying this patch I fixed it up to:
--------------------
Commit that caused this problem: eadd3c4b ("iwlwifi: make Makefile more concise")
--------------------
Please do this in the future, thanks.
drivers/net/wireless/iwlwifi/Makefile line 2
Quoted 8 lines
drivers/net/wireless/iwlwifi/Makefile +1
-1@@ -1,4 +1,4 @@ -obj-$(CONFIG_IWLCORE) := iwlcore.o +obj-$(CONFIG_IWLCORE) += iwlcore.o iwlcore-objs := iwl-core.o iwl-eeprom.o iwl-hcmd.o iwl-power.o
I had to apply this patch by hand because "iwl-power.o" is not present in the iwlcore-objs line in the current tree.
Does it exist in John's wireless tree or something like that? This new iwl-power.o object looks like it would be new code and a new feature, which we wouldn't be able to add into the tree at this time as all networking new features have gone into the merge window already.
Please do not mix bug fixes with new code changes like that.
To expedite getting this bug fix applied, I've added this fix by hand and will push it to Linus tonight.
Thank you.
Quoted 12 lines · David Miller
From: Tomas Winkler <[email protected]>
drivers/net/wireless/iwlwifi/Makefile line 2
Quoted 6 lines
drivers/net/wireless/iwlwifi/Makefile +1
-1@@ -1,4 +1,4 @@ -obj-$(CONFIG_IWLCORE) := iwlcore.o +obj-$(CONFIG_IWLCORE) += iwlcore.o iwlcore-objs := iwl-core.o iwl-eeprom.o iwl-hcmd.o iwl-power.oI had to apply this patch by hand because "iwl-power.o" is not present in the iwlcore-objs line in the current tree.
Quoted 5 lines
Does it exist in John's wireless tree or something like that? This new iwl-power.o object looks like it would be new code and a new feature, which we wouldn't be able to add into the tree at this time as all networking new features have gone into the merge window already.
FWIW, I don't have an iwl-power.c either. Please be careful to send patches against the actual upstream tree rather than a working tree. :-)
Quoted 2 lines
To expedite getting this bug fix applied, I've added this fix by hand and will push it to Linus tonight.
Thanks, Dave!
John
Signature · 2 lines
John W. Linville [email protected]
Quoted 9 lines · John W. Linville
Quoted 8 lines · David Miller
From: Tomas Winkler <[email protected]>
drivers/net/wireless/iwlwifi/Makefile line 2
Quoted 6 lines
drivers/net/wireless/iwlwifi/Makefile +1
-1@@ -1,4 +1,4 @@ -obj-$(CONFIG_IWLCORE) := iwlcore.o +obj-$(CONFIG_IWLCORE) += iwlcore.o iwlcore-objs := iwl-core.o iwl-eeprom.o iwl-hcmd.o
iwl-power.o
Quoted 10 lines
Quoted 9 lines
I had to apply this patch by hand because "iwl-power.o" is not present in the iwlcore-objs line in the current tree.
Does it exist in John's wireless tree or something like that? This new iwl-power.o object looks like it would be new code and a new feature, which we wouldn't be able to add into the tree at this time as all networking new features have gone into the merge window already.
Quoted 3 lines
FWIW, I don't have an
iwl-power.ceither. Please be careful to send patches against the actual upstream tree rather than a working tree. :-)
We submitted this patch on top of patches we have already submitted. iwl-power is introduced in patch "iwlwifi: Add power level support" submitted on 04/21/2008
(http://marc.info/?l=linux-wireless&m=120881778101353&w=2)
Reinette
PATCH 1/1 iwlwifi: Fix built-in compilation of iwlcore (part 2)
In reply to Tomas WinklerQuoted 2 lines · Tomas Winkler
This patch fixes problem in
Makefilethat prevented built-in compilation of iwlcore
Here is the second part. Without this, drivers/net/wireless/iwlwifi/build-in.o will not be linked into vmlinux.
(quoted diff) +0 -0
b/drivers/net/wireless/Makefile
index 300fc68..41eb08e 100644
drivers/net/wireless/Makefile +1 -2
@@ -58,8 +58,7 @@ obj-$(CONFIG_RTL8187) += rtl8187.o obj-$(CONFIG_ADM8211) += adm8211.o -obj-$(CONFIG_IWL3945) += iwlwifi/ -obj-$(CONFIG_IWL4965) += iwlwifi/ +obj-$(CONFIG_IWLCORE) += iwlwifi/ obj-$(CONFIG_RT2X00) += rt2x00/ obj-$(CONFIG_P54_COMMON) += p54/
Re: [PATCH] iwlwifi: Fix built-in compilation of iwlcore (part 2)
From: Zhu Yi <[email protected]>
Date: Thu, 24 Apr 2008 10:31:47 +0800
Quoted 8 lines · Tomas Winkler
Quoted 2 lines
This patch fixes problem in
Makefilethat prevented built-in compilation of iwlcoreHere is the second part. Without this,
drivers/net/wireless/iwlwifi/build-in.owill not be linked into vmlinux.Signed-off-by Zhu Yi <[email protected]>
Did you guys even test the original patch sent last night at all?
Sigh... I'll add this, thanks.
Re: [PATCH] iwlwifi: Fix built-in compilation of iwlcore (part 2)
Quoted 1 line · David Miller
Did you guys even test the original patch sent last night at all?
Sorry, too rush for the first one.
Thanks,
-yi