This patch fixes problem in Makefile that prevented
built-in compilation of iwlcore
Commit that caused this problem: eadd3c4b
Signed-off-by: Tomas Winkler <[email protected]>
Signed-off-by: Yi Zhu <[email protected]>
---
drivers/net/wireless/iwlwifi/Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/Makefile b/drivers/net/wireless/iwlwifi/Makefile
index 4f3e88b..ec6187b 100644
--- a/drivers/net/wireless/iwlwifi/Makefile
+++ b/drivers/net/wireless/iwlwifi/Makefile
@@ -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
iwlcore-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o
iwlcore-$(CONFIG_IWLWIFI_LEDS) += iwl-led.o
--
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.
On Wednesday, April 23, 2008 1:52 PM, John W. Linville wrote:
> On Wed, Apr 23, 2008 at 03:49:43AM -0700, David Miller wrote:
>> From: Tomas Winkler <[email protected]>
>
>>> --- a/drivers/net/wireless/iwlwifi/Makefile
>>> +++ b/drivers/net/wireless/iwlwifi/Makefile
>>> @@ -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.
>
> 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. :-)
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