From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 6 May 2009 18:16:15 +0000 (-0400)
Subject: p54: correct merge damage from "p54: more SoftLED updates"
X-Git-Tag: v2.6.31-rc1~330^2~448^2~9
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=83f8b478ff5ed7d7df0bf91336bbede7b4714771;p=~emulex%2Finfiniband.git

p54: correct merge damage from "p54: more SoftLED updates"

Ooops...

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/p54/p54.h b/drivers/net/wireless/p54/p54.h
index 7fda1a9e263..db3df947d8e 100644
--- a/drivers/net/wireless/p54/p54.h
+++ b/drivers/net/wireless/p54/p54.h
@@ -189,10 +189,10 @@ struct p54_common {
 	unsigned long *used_rxkeys;
 
 	/* LED management */
-#ifdef CONFIG_MAC80211_LEDS
+#ifdef CONFIG_P54_LEDS
 	struct p54_led_dev leds[4];
 	struct delayed_work led_work;
-#endif /* CONFIG_MAC80211_LEDS */
+#endif /* CONFIG_P54_LEDS */
 	u16 softled_state;		/* bit field of glowing LEDs */
 
 	/* statistics */