diff options
author | John W. Linville <linville@tuxdriver.com> | 2009-05-06 14:16:15 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-05-06 15:15:03 -0400 |
commit | 83f8b478ff5ed7d7df0bf91336bbede7b4714771 (patch) | |
tree | 7b9af869fd4f45daabb9075e402ab88aeaa9002f | |
parent | 8a7130404948b966e98b1285e777972b4b3f2fa2 (diff) |
p54: correct merge damage from "p54: more SoftLED updates"
Ooops...
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/p54/p54.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/p54/p54.h b/drivers/net/wireless/p54/p54.h index 7fda1a9e263b..db3df947d8ed 100644 --- a/drivers/net/wireless/p54/p54.h +++ b/drivers/net/wireless/p54/p54.h | |||
@@ -189,10 +189,10 @@ struct p54_common { | |||
189 | unsigned long *used_rxkeys; | 189 | unsigned long *used_rxkeys; |
190 | 190 | ||
191 | /* LED management */ | 191 | /* LED management */ |
192 | #ifdef CONFIG_MAC80211_LEDS | 192 | #ifdef CONFIG_P54_LEDS |
193 | struct p54_led_dev leds[4]; | 193 | struct p54_led_dev leds[4]; |
194 | struct delayed_work led_work; | 194 | struct delayed_work led_work; |
195 | #endif /* CONFIG_MAC80211_LEDS */ | 195 | #endif /* CONFIG_P54_LEDS */ |
196 | u16 softled_state; /* bit field of glowing LEDs */ | 196 | u16 softled_state; /* bit field of glowing LEDs */ |
197 | 197 | ||
198 | /* statistics */ | 198 | /* statistics */ |