From 45e3898a1122337ee1453883026b15056d6321c0 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Tue, 14 Jan 2014 23:11:10 +0000 Subject: [PATCH] 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 SVN-Revision: 39290 --- package/kernel/button-hotplug/src/button-hotplug.c | 3 +-- package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c | 1 + 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 df50a23018c..8f84eb10846 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 780736c89bb..6b69d2751c7 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"), }; /* -------------------------------------------------------------------------*/ -- 2.30.2