[PATCH] iwlwifi: Fix build error in v2.6.25-5561-g064922a

I've just tried to compile v2.6.25-5561-g064922a and it failed with
these messages:

drivers/built-in.o: In function `iwl_leds_unregister_led':
iwl-led.c:(.text+0x7f14a): undefined reference to `led_classdev_unregister'
drivers/built-in.o: In function `iwl_leds_register_led':
iwl-led.c:(.text+0x7f220): undefined reference to `led_classdev_register'
make: *** [.tmp_vmlinux1] Error 1

and I checked that it was due to CONFIG_IWL4965_LEDS=y and
CONFIG_LEDS_CLASS=m in my .config.

If I CONFIG_LEDS_CLASS is also =y then it builds fine.

So I tried to cook up a patch to avoid that. It doesn't look
elegant but it avoids this problem for me :-)


--
From 7116035343f4d031807aa73c92434eab3863de56 Mon Sep 17 00:00:00 2001
From: Carlos R. Mafra <crmafra@xxxxxxxxxxxx>
Date: Mon, 28 Apr 2008 02:12:22 -0300
Subject: [PATCH] iwlwifi: Fix build failure due to CONFIG_LEDS_CLASS=m

The compilation of v2.6.25-5561-g064922a fails with

drivers/built-in.o: In function `iwl_leds_unregister_led':
iwl-led.c:(.text+0x7f14a): undefined reference to `led_classdev_unregister'
drivers/built-in.o: In function `iwl_leds_register_led':
iwl-led.c:(.text+0x7f220): undefined reference to `led_classdev_register'
make: *** [.tmp_vmlinux1] Error 1

and this is the relevant part of .config which caused it

CONFIG_MAC80211_LEDS=y
CONFIG_IWLWIFI_LEDS=y
CONFIG_IWL4965_LEDS=y
CONFIG_LEDS_CLASS=m

The problem was that CONFIG_IWL_4965_LEDS was compiled in and
CONFIG_LEDS_CLASS was modular. To avoid this build failure
make IWL_4965_LEDS depend on LEDS_CLASS=y.

Signed-off-by: Carlos R. Mafra <crmafra@xxxxxxxxxxxx>
---
drivers/net/wireless/iwlwifi/Kconfig | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index c4e631d..6081f92 100644
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -49,9 +49,8 @@ config IWL4965_HT

config IWL4965_LEDS
bool "Enable LEDS features in iwl4965 driver"
- depends on IWL4965
+ depends on IWL4965 && LEDS_CLASS = y
select MAC80211_LEDS
- select LEDS_CLASS
select IWLWIFI_LEDS
---help---
This option enables LEDS for the iwlwifi drivers
--
1.5.4.3.220.g99d8e





--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Relevant Pages

  • Re: Partitioned cluster question (reboot during lost quorum)
    ... Welll, my own idea is to be able to boot distinctly and completely and fully outside the cluster, and to thus reduce the chances of creatively configured corruptions. ... If I can configure to avoid the problem, then I will. ... But when shadowset members appear gradually as nodes boot, ... physical drive has the valid contents comes from knowing the config, ...
    (comp.os.vms)
  • Re: stuck with 2.6.23.14 on x86_64
    ... the lastest that I can compile is 2.6.23.14; ... All .config are the same, ... SCSI controller: ... Right now, on AMD64 machines, I'm forced to patch by hand the kernel, ...
    (Linux-Kernel)
  • Re: C99 Question
    ... avoid shadowing type names to avoid confusion. ... When I compile a C program as C++, I make a habit of also testing the ... I tend to constrain myself to the very large subset of C ... You must be glad you cought it. ...
    (comp.lang.c)
  • Re: Where does C++ fit in?
    ... code and compile it as C++. ... static constructors, memory allocation, exceptions). ... even there avoid stuff you don't need or can't afford. ... but watch out for static constructors if you're in the startup code. ...
    (comp.arch.embedded)
  • Re: Computer Shutsdown
    ... When I compile something big..kernel recompile, ... > Can anyone suggest me what do do, to avoid such shutdowns, Kernel ...
    (Fedora)