aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-01-14 23:11:10 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2014-01-14 23:11:10 +0000
commit45e3898a1122337ee1453883026b15056d6321c0 (patch)
treef35b8f2dfbcb1feb685d40c028e7c1ccd8d23ee1
parentbf662d7cb09d02094c99f4cbfab19a8eed6d0dfc (diff)
downloadupstream-45e3898a1122337ee1453883026b15056d6321c0.tar.gz
upstream-45e3898a1122337ee1453883026b15056d6321c0.tar.bz2
upstream-45e3898a1122337ee1453883026b15056d6321c0.zip
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
-rw-r--r--package/kernel/button-hotplug/src/button-hotplug.c3
-rw-r--r--package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c1
2 files changed, 2 insertions, 2 deletions
diff --git a/package/kernel/button-hotplug/src/button-hotplug.c b/package/kernel/button-hotplug/src/button-hotplug.c
index df50a23018..8f84eb1084 100644
--- 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 780736c89b..6b69d2751c 100644
--- 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"),
};
/* -------------------------------------------------------------------------*/