iwlwifi: remove redundant flags regarding to FAT channel

[safe/jmp/linux-2.6] / drivers / net / wireless / b43 / rfkill.h

diff --git a/drivers/net/wireless/b43/rfkill.h b/drivers/net/wireless/b43/rfkill.h
index 05db0d6..adacf93 100644 (file)
--- a/drivers/net/wireless/b43/rfkill.h
+++ b/drivers/net/wireless/b43/rfkill.h
@@ -7,19 +7,25 @@ struct b43_wldev;
 #ifdef CONFIG_B43_RFKILL
 
 #include <linux/rfkill.h>
+#include <linux/input-polldev.h>
+
 
 struct b43_rfkill {
        /* The RFKILL subsystem data structure */
        struct rfkill *rfkill;
+       /* The poll device for the RFKILL input button */
+       struct input_polled_dev *poll_dev;
+       /* Did initialization succeed? Used for freeing. */
+       bool registered;
        /* The unique name of this rfkill switch */
-       char name[32];
-       /* Workqueue for asynchronous notification. */
-       struct work_struct notify_work;
+       char name[sizeof("b43-phy4294967295")];
 };
 
+/* The init function returns void, because we are not interested
+ * in failing the b43 init process when rfkill init failed. */
 void b43_rfkill_init(struct b43_wldev *dev);
 void b43_rfkill_exit(struct b43_wldev *dev);
-void b43_rfkill_toggled(struct b43_wldev *dev, bool on);
+
 char * b43_rfkill_led_name(struct b43_wldev *dev);
 
 
@@ -36,9 +42,6 @@ static inline void b43_rfkill_init(struct b43_wldev *dev)
 static inline void b43_rfkill_exit(struct b43_wldev *dev)
 {
 }
-static inline void b43_rfkill_toggled(struct b43_wldev *dev, bool on)
-{
-}
 static inline char * b43_rfkill_led_name(struct b43_wldev *dev)
 {
        return NULL;