lkml.org 
[lkml]   [2008]   [Jul]   [21]   [last100]   RSS Feed
Views: [more markup]  [less markup]  [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
DateMon, 21 Jul 2008 10:36:54 +0200
FromIngo Molnar <>
Subjectiwlwifi: fix build bug in "iwlwifi: fix LED stall"
hi David,

>       iwlwifi: fix LED stall

please find a small build fix below.

	Ingo

-------------->
commit c61b0199e779caf2dcfdb6e83439c1fdf9f20209
Author: Ingo Molnar <mingo@elte.hu>
Date:   Mon Jul 21 10:33:42 2008 +0200
    iwlwifi: fix build bug in "iwlwifi: fix LED stall"

    -tip testing found the following build failure:

      drivers/net/wireless/iwlwifi/iwl-led.c: In function ‘iwl_led_brightness_set’:
      drivers/net/wireless/iwlwifi/iwl-led.c:198: error: ‘led_type_str’ undeclared (first use in this function)
      drivers/net/wireless/iwlwifi/iwl-led.c:198: error: (Each undeclared identifier is reported only once
      drivers/net/wireless/iwlwifi/iwl-led.c:198: error: for each function it appears in.)

    Triggered if this driver is built with !CONFIG_IWLWIFI_DEBUG. Introduced
    by commit 0eee61273.

    The best fix is to make led_type_str available as a zero-size symbol and to
    only add members to the array if CONFIG_IWLWIFI_DEBUG is set. This way
    there's no overhead in the debugging case and we have type checking in the
    IWL_DEBUG_LED() macro as well.

    Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 drivers/net/wireless/iwlwifi/iwl-led.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl-led.c b/drivers/net/wireless/iwlwifi/iwl-led.c
index 899d7a2..d7129f7 100644
--- a/drivers/net/wireless/iwlwifi/iwl-led.c
+++ b/drivers/net/wireless/iwlwifi/iwl-led.c
@@ -44,15 +44,15 @@
 #include "iwl-io.h"
 #include "iwl-helpers.h"
 
-#ifdef CONFIG_IWLWIFI_DEBUG
 static const char *led_type_str[] = {
+#ifdef CONFIG_IWLWIFI_DEBUG
 	__stringify(IWL_LED_TRG_TX),
 	__stringify(IWL_LED_TRG_RX),
 	__stringify(IWL_LED_TRG_ASSOC),
 	__stringify(IWL_LED_TRG_RADIO),
 	NULL
-};
 #endif /* CONFIG_IWLWIFI_DEBUG */
+};
 
 
 static const struct {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2008-07-21 10:39    [from the cache]
©2003-2008