mac80211: update to 2015-12-03

[openwrt/openwrt.git] / package / kernel / button-hotplug / src / button-hotplug.c

diff --git a/package/kernel/button-hotplug/src/button-hotplug.c b/package/kernel/button-hotplug/src/button-hotplug.c
index 4a8c4a88ed4e0a91b040c204b2636a919d8bc18d..41fdf3a256280336dd09fe0b0860c574c666c45c 100644 (file)
--- a/package/kernel/button-hotplug/src/button-hotplug.c
+++ b/package/kernel/button-hotplug/src/button-hotplug.c
@@ -84,9 +84,10 @@ static struct bh_map button_map[] = {
        BH_MAP(BTN_8,           "BTN_8"),
        BH_MAP(BTN_9,           "BTN_9"),
        BH_MAP(KEY_RESTART,     "reset"),
-#ifdef KEY_WPS_BUTTON
+       BH_MAP(KEY_POWER,       "power"),
+       BH_MAP(KEY_RFKILL,      "rfkill"),
        BH_MAP(KEY_WPS_BUTTON,  "wps"),
-#endif /* KEY_WPS_BUTTON */
+       BH_MAP(KEY_WIMAX,       "wwan"),
 };
 
 /* -------------------------------------------------------------------------*/
@@ -207,7 +208,6 @@ static int button_hotplug_create_event(const char *name, unsigned long seen,
 
 /* -------------------------------------------------------------------------*/
 
-#ifdef CONFIG_HOTPLUG
 static int button_get_index(unsigned int code)
 {
        int i;
@@ -238,12 +238,6 @@ static void button_hotplug_event(struct input_handle *handle,
                        (seen - priv->seen[btn]) / HZ, value);
        priv->seen[btn] = seen;
 }
-#else
-static void button_hotplug_event(struct input_handle *handle,
-                          unsigned int type, unsigned int code, int value)
-{
-}
-#endif /* CONFIG_HOTPLUG */
 
 static int button_hotplug_connect(struct input_handler *handler,
                struct input_dev *dev, const struct input_device_id *id)