Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / rt2x00 / rt2x00leds.h

diff --git a/drivers/net/wireless/rt2x00/rt2x00leds.h b/drivers/net/wireless/rt2x00/rt2x00leds.h
index 11e71e9ce853d7c32fda081f6cc63e4abcbd5856..9df4a49bdcad22660adf0f16feb13192e0b97a35 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2x00leds.h
+++ b/drivers/net/wireless/rt2x00/rt2x00leds.h
@@ -26,18 +26,10 @@
 #ifndef RT2X00LEDS_H
 #define RT2X00LEDS_H
 
-/*
-* Flags used by driver to indicate which
- * which led types are supported.
- */
-#define LED_SUPPORT_RADIO      0x000001
-#define LED_SUPPORT_ASSOC      0x000002
-#define LED_SUPPORT_ACTIVITY   0x000004
-#define LED_SUPPORT_QUALITY    0x000008
-
 enum led_type {
        LED_TYPE_RADIO,
        LED_TYPE_ASSOC,
+       LED_TYPE_ACTIVITY,
        LED_TYPE_QUALITY,
 };
 
@@ -48,14 +40,9 @@ struct rt2x00_led {
        struct led_classdev led_dev;
 
        enum led_type type;
-       unsigned int registered;
-};
-
-struct rt2x00_trigger {
-       struct led_trigger trigger;
-
-       enum led_type type;
-       unsigned int registered;
+       unsigned int flags;
+#define LED_INITIALIZED                ( 1 << 0 )
+#define LED_REGISTERED         ( 1 << 1 )
 };
 
 #endif /* CONFIG_RT2X00_LIB_LEDS */