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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
drivers
/
input
/
misc
/
wistron_btns.c
diff --git
a/drivers/input/misc/wistron_btns.c
b/drivers/input/misc/wistron_btns.c
index
12501de
..
52b4193
100644
(file)
--- a/
drivers/input/misc/wistron_btns.c
+++ b/
drivers/input/misc/wistron_btns.c
@@
-274,7
+274,7
@@
static struct key_entry keymap_fs_amilo_pro_v3505[] __initdata = {
{ KE_BLUETOOTH, 0x30 }, /* Fn+F10 */
{ KE_KEY, 0x31, {KEY_MAIL} }, /* mail button */
{ KE_KEY, 0x36, {KEY_WWW} }, /* www button */
- { KE_WIFI, 0x78 }, /* satelite dish button */
+ { KE_WIFI, 0x78 }, /* satel
l
ite dish button */
{ KE_END, 0 }
};