b43legacy: properly fix a bogus gcc warning

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

diff --git a/drivers/net/wireless/b43legacy/b43legacy.h b/drivers/net/wireless/b43legacy/b43legacy.h
index afe145cec06757c70844e2c967ae4c946acc21b7..fe2af06f5599d2d62ac8c2d38904e918e8d633c6 100644 (file)
--- a/drivers/net/wireless/b43legacy/b43legacy.h
+++ b/drivers/net/wireless/b43legacy/b43legacy.h
@@ -19,6 +19,7 @@
 
 #include "debugfs.h"
 #include "leds.h"
+#include "rfkill.h"
 #include "phy.h"
 
 
@@ -592,6 +593,9 @@ struct b43legacy_wl {
        u8 rng_initialized;
        char rng_name[30 + 1];
 
+       /* The RF-kill button */
+       struct b43legacy_rfkill rfkill;
+
        /* List of all wireless devices on this chip */
        struct list_head devlist;
        u8 nr_devs;
@@ -663,8 +667,11 @@ struct b43legacy_wldev {
        /* Various statistics about the physical device. */
        struct b43legacy_stats stats;
 
-#define B43legacy_NR_LEDS              4
-       struct b43legacy_led leds[B43legacy_NR_LEDS];
+       /* The device LEDs. */
+       struct b43legacy_led led_tx;
+       struct b43legacy_led led_rx;
+       struct b43legacy_led led_assoc;
+       struct b43legacy_led led_radio;
 
        /* Reason code of the last interrupt. */
        u32 irq_reason;