projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8a71304
)
p54: correct merge damage from "p54: more SoftLED updates"
author
John W. Linville
<linville@tuxdriver.com>
Wed, 6 May 2009 18:16:15 +0000
(14:16 -0400)
committer
John 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
|
history
diff --git
a/drivers/net/wireless/p54/p54.h
b/drivers/net/wireless/p54/p54.h
index
7fda1a9
..
db3df94
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 */