summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorChristian Lamparter <chunkeey@googlemail.com>2010-03-08 15:25:29 -0800
committerNicolas Pitre <nico@fluxnic.net>2010-03-23 13:48:14 -0400
commit9705c3961e73054b656720884f0da0a5a438fbae (patch)
treedef61e8bd6f54997e3ffab11d0bc7aec1032461c /arch
parent4f4669ee732a6b37279e912af1833fbff15407a2 (diff)
downloadlinux-3.10-9705c3961e73054b656720884f0da0a5a438fbae.tar.gz
linux-3.10-9705c3961e73054b656720884f0da0a5a438fbae.tar.bz2
linux-3.10-9705c3961e73054b656720884f0da0a5a438fbae.zip
[ARM] Kirkwood: WPS button keycode mapping
Commit "Input: add KEY_WPS_BUTTON definition" added a generic keycode for WPS button. Let's use it, instead of "F1" mapping. Signed-off-by: Christian Lamparter <chunkeey@googlemail.com> Signed-off-by: Nicolas Pitre <nico@marvell.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c b/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c
index 0358f45766c..5e6f711b1c6 100644
--- a/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c
+++ b/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c
@@ -74,9 +74,9 @@ static struct gpio_keys_button mv88f6281gtw_ge_button_pins[] = {
.desc = "SWR Button",
.active_low = 1,
}, {
- .code = KEY_F1,
+ .code = KEY_WPS_BUTTON,
.gpio = 46,
- .desc = "WPS Button(F1)",
+ .desc = "WPS Button",
.active_low = 1,
},
};