Commit 83f8b478 authored by John W. Linville's avatar John W. Linville

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

Ooops...
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8a713040
...@@ -189,10 +189,10 @@ struct p54_common { ...@@ -189,10 +189,10 @@ struct p54_common {
unsigned long *used_rxkeys; unsigned long *used_rxkeys;
/* LED management */ /* LED management */
#ifdef CONFIG_MAC80211_LEDS #ifdef CONFIG_P54_LEDS
struct p54_led_dev leds[4]; struct p54_led_dev leds[4];
struct delayed_work led_work; struct delayed_work led_work;
#endif /* CONFIG_MAC80211_LEDS */ #endif /* CONFIG_P54_LEDS */
u16 softled_state; /* bit field of glowing LEDs */ u16 softled_state; /* bit field of glowing LEDs */
/* statistics */ /* statistics */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment