git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/hda' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-kirkwood
/
mv88f6281gtw_ge-setup.c
diff --git
a/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c
b/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c
index
0358f45
..
5e6f711
100644
(file)
--- 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,
},
};