diff options
author | Thorsten Maerz <torte@netztorte.de> | 2005-11-09 00:35:15 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 10:56:02 -0500 |
commit | a18a80b09f78178f6404b538ab09937ee9044e2e (patch) | |
tree | 53bd84dec04f404f22892c93c9558daa390ef22f /drivers/media/dvb/dvb-usb | |
parent | 6573dd752d50730d44c550ad0467d15871963655 (diff) |
[PATCH] dvb: remove duplicate key definitions
The duplicate key definitions cause misinterpretations with other keys, e.g.
the "TELETEXT" key clashes with "CHANNEL_UP" and thus can not be used with
LIRC. This patch removes these duplicates.
Signed-off-by: Thorsten Maerz <torte@netztorte.de>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Cc: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/dvb/dvb-usb')
-rw-r--r-- | drivers/media/dvb/dvb-usb/a800.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/media/dvb/dvb-usb/a800.c b/drivers/media/dvb/dvb-usb/a800.c index e55322ef76b3..49f541d9a042 100644 --- a/drivers/media/dvb/dvb-usb/a800.c +++ b/drivers/media/dvb/dvb-usb/a800.c | |||
@@ -43,11 +43,9 @@ static struct dvb_usb_rc_key a800_rc_keys[] = { | |||
43 | { 0x02, 0x13, KEY_RIGHT }, /* R / CH RTN */ | 43 | { 0x02, 0x13, KEY_RIGHT }, /* R / CH RTN */ |
44 | { 0x02, 0x17, KEY_PROG2 }, /* SNAP SHOT */ | 44 | { 0x02, 0x17, KEY_PROG2 }, /* SNAP SHOT */ |
45 | { 0x02, 0x10, KEY_PROG3 }, /* 16-CH PREV */ | 45 | { 0x02, 0x10, KEY_PROG3 }, /* 16-CH PREV */ |
46 | { 0x02, 0x03, KEY_CHANNELUP }, /* CH UP */ | ||
47 | { 0x02, 0x1e, KEY_VOLUMEDOWN }, /* VOL DOWN */ | 46 | { 0x02, 0x1e, KEY_VOLUMEDOWN }, /* VOL DOWN */ |
48 | { 0x02, 0x0c, KEY_ZOOM }, /* FULL SCREEN */ | 47 | { 0x02, 0x0c, KEY_ZOOM }, /* FULL SCREEN */ |
49 | { 0x02, 0x1f, KEY_VOLUMEUP }, /* VOL UP */ | 48 | { 0x02, 0x1f, KEY_VOLUMEUP }, /* VOL UP */ |
50 | { 0x02, 0x02, KEY_CHANNELDOWN }, /* CH DOWN */ | ||
51 | { 0x02, 0x14, KEY_MUTE }, /* MUTE */ | 49 | { 0x02, 0x14, KEY_MUTE }, /* MUTE */ |
52 | { 0x02, 0x08, KEY_AUDIO }, /* AUDIO */ | 50 | { 0x02, 0x08, KEY_AUDIO }, /* AUDIO */ |
53 | { 0x02, 0x19, KEY_RECORD }, /* RECORD */ | 51 | { 0x02, 0x19, KEY_RECORD }, /* RECORD */ |
@@ -57,8 +55,6 @@ static struct dvb_usb_rc_key a800_rc_keys[] = { | |||
57 | { 0x02, 0x1d, KEY_BACK }, /* << / RED */ | 55 | { 0x02, 0x1d, KEY_BACK }, /* << / RED */ |
58 | { 0x02, 0x1c, KEY_FORWARD }, /* >> / YELLOW */ | 56 | { 0x02, 0x1c, KEY_FORWARD }, /* >> / YELLOW */ |
59 | { 0x02, 0x03, KEY_TEXT }, /* TELETEXT */ | 57 | { 0x02, 0x03, KEY_TEXT }, /* TELETEXT */ |
60 | { 0x02, 0x01, KEY_FIRST }, /* |<< / GREEN */ | ||
61 | { 0x02, 0x00, KEY_LAST }, /* >>| / BLUE */ | ||
62 | { 0x02, 0x04, KEY_EPG }, /* EPG */ | 58 | { 0x02, 0x04, KEY_EPG }, /* EPG */ |
63 | { 0x02, 0x15, KEY_MENU }, /* MENU */ | 59 | { 0x02, 0x15, KEY_MENU }, /* MENU */ |
64 | 60 | ||