projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8a71304)
p54: correct merge damage from "p54: more SoftLED updates"
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 6 May 2009 18:16:15 +0000 (14:16 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 6 May 2009 19:15:03 +0000 (15:15 -0400)
Ooops...

Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/p54/p54.h patch | blob | blame | history

diff --git a/drivers/net/wireless/p54/p54.h b/drivers/net/wireless/p54/p54.h
index 7fda1a9e263b0f428fc0223e7def5d76cbbe833c..db3df947d8ed45b2c2c623e8dd918b691bc8436d 100644 (file)
--- 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 */