summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c
diff options
context:
space:
mode:
authorChristian Lamparter2010-03-09 00:25:29 +0100
committerNicolas Pitre2010-03-23 18:48:14 +0100
commit9705c3961e73054b656720884f0da0a5a438fbae (patch)
treedef61e8bd6f54997e3ffab11d0bc7aec1032461c /arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c
parentMerge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/px... (diff)
downloadkernel-qcow2-linux-9705c3961e73054b656720884f0da0a5a438fbae.tar.gz
kernel-qcow2-linux-9705c3961e73054b656720884f0da0a5a438fbae.tar.xz
kernel-qcow2-linux-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/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c')
-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 0358f45766cb..5e6f711b1c67 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,
},
};