Skip to content

Commit

Permalink
p54: correct merge damage from "p54: more SoftLED updates"
Browse files Browse the repository at this point in the history
Ooops...

Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
John W. Linville committed May 6, 2009
1 parent 8a71304 commit 83f8b47
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/net/wireless/p54/p54.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit 83f8b47

Please sign in to comment.