gpio-button-hotplug: add wwan button

The wimax key will be used as a generic wwan key starting with Linux
3.13. The brcm47xx target uses this key for the 3g buttons. Also remove
the ifdef around KEY_WPS_BUTTON, this is in the kernel for a long time
now.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 39290

diff --git a/package/kernel/button-hotplug/src/button-hotplug.c b/package/kernel/button-hotplug/src/button-hotplug.c
index df50a23018c47568e2181cde9bed07f8fd18b9c1..8f84eb108463b80ae185b9708aed0b2999b83803 100644 (file)
--- a/package/kernel/button-hotplug/src/button-hotplug.c
+++ b/package/kernel/button-hotplug/src/button-hotplug.c
@@ -86,9 +86,8 @@ static struct bh_map button_map[] = {
        BH_MAP(KEY_RESTART,     "reset"),
        BH_MAP(KEY_POWER,       "power"),
        BH_MAP(KEY_RFKILL,      "rfkill"),
-#ifdef KEY_WPS_BUTTON
        BH_MAP(KEY_WPS_BUTTON,  "wps"),
-#endif /* KEY_WPS_BUTTON */
+       BH_MAP(KEY_WIMAX,       "wwan"),
 };
 
 /* -------------------------------------------------------------------------*/

diff --git a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c
index 780736c89bb66c1904a718514f10ec7ad6b47813..6b69d2751c7c4470bf39afc4068580a02b9e08af 100644 (file)
--- a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c
+++ b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c
@@ -96,6 +96,7 @@ static struct bh_map button_map[] = {
        BH_MAP(KEY_RESTART,     "reset"),
        BH_MAP(KEY_RFKILL,      "rfkill"),
        BH_MAP(KEY_WPS_BUTTON,  "wps"),
+       BH_MAP(KEY_WIMAX,       "wwan"),
 };
 
 /* -------------------------------------------------------------------------*/