aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2011-05-24 00:06:26 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-05-24 00:06:26 -0700
commitb73077eb03f510a84b102fb97640e595a958403c (patch)
tree8b639000418e2756bf6baece4e00e07d2534bccc /drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c
parentInput: ads7846 - remove unused variable from struct ads7845_ser_req (diff)
parentInput: ADP5589 - new driver for I2C Keypad Decoder and I/O Expander (diff)
downloadlinux-dev-b73077eb03f510a84b102fb97640e595a958403c.tar.xz
linux-dev-b73077eb03f510a84b102fb97640e595a958403c.zip
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c')
-rw-r--r--drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c b/drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c
index fa8fd0ab94c7..8e9969d1239b 100644
--- a/drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c
+++ b/drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c
@@ -62,7 +62,7 @@ static struct rc_map_table msi_tvanywhere_plus[] = {
{ 0x13, KEY_AGAIN }, /* Recall */
{ 0x1e, KEY_POWER }, /* Power */
- { 0x07, KEY_TUNER }, /* Source */
+ { 0x07, KEY_VIDEO }, /* Source */
{ 0x1c, KEY_SEARCH }, /* Scan */
{ 0x18, KEY_MUTE }, /* Mute */