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 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal...
[pandora-kernel.git]
/
drivers
/
media
/
rc
/
keymaps
/
rc-cinergy.c
diff --git
a/drivers/media/rc/keymaps/rc-cinergy.c
b/drivers/media/rc/keymaps/rc-cinergy.c
index
99520ff
..
cf3a6bf
100644
(file)
--- a/
drivers/media/rc/keymaps/rc-cinergy.c
+++ b/
drivers/media/rc/keymaps/rc-cinergy.c
@@
-25,7
+25,7
@@
static struct rc_map_table cinergy[] = {
{ 0x09, KEY_9 },
{ 0x0a, KEY_POWER },
- { 0x0b, KEY_
PROG1
}, /* app */
+ { 0x0b, KEY_
MEDIA
}, /* app */
{ 0x0c, KEY_ZOOM }, /* zoom/fullscreen */
{ 0x0d, KEY_CHANNELUP }, /* channel */
{ 0x0e, KEY_CHANNELDOWN }, /* channel- */