diff options
| author | Michael Krufky <devnull@localhost> | 2005-08-10 15:16:31 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-08-10 15:16:31 +0000 |
| commit | ccdcb6d699ce367adaf8f48a71c497aefca23edd (patch) | |
| tree | 3b57a264647a019bb0f70b89be8933b166dc93f9 | |
| parent | f69a7d19072a6732d6b8b5294b9263c7e4f73256 (diff) | |
| download | mediapointer-dvb-s2-ccdcb6d699ce367adaf8f48a71c497aefca23edd.tar.gz mediapointer-dvb-s2-ccdcb6d699ce367adaf8f48a71c497aefca23edd.tar.bz2 | |
removed trailing whitespace
| -rw-r--r-- | linux/Documentation/video4linux/CARDLIST.bttv | 2 | ||||
| -rw-r--r-- | linux/Documentation/video4linux/CARDLIST.saa7134 | 1 | ||||
| -rw-r--r-- | linux/Documentation/video4linux/CARDLIST.tuner | 1 | ||||
| -rw-r--r-- | linux/drivers/media/common/ir-common.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-input.c | 8 |
5 files changed, 9 insertions, 7 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.bttv b/linux/Documentation/video4linux/CARDLIST.bttv index 1a66b7823..7979c060e 100644 --- a/linux/Documentation/video4linux/CARDLIST.bttv +++ b/linux/Documentation/video4linux/CARDLIST.bttv @@ -134,4 +134,4 @@ card=132 - Kodicom 4400R (master) card=133 - Kodicom 4400R (slave) card=134 - Adlink RTV24 card=135 - DVICO FusionHDTV 5 Lite -card=136 - Acorp Y878f +card=136 - Acorp Y878F diff --git a/linux/Documentation/video4linux/CARDLIST.saa7134 b/linux/Documentation/video4linux/CARDLIST.saa7134 index 1b5a3a9ff..9c8b1ca1c 100644 --- a/linux/Documentation/video4linux/CARDLIST.saa7134 +++ b/linux/Documentation/video4linux/CARDLIST.saa7134 @@ -62,3 +62,4 @@ 61 -> Philips TOUGH DVB-T reference design [1131:2004] 62 -> Compro VideoMate TV Gold+II 63 -> Kworld Xpert TV PVR7134 + 64 -> FlyTV mini Asus Digimatrix [1043:0210,1043:0210] diff --git a/linux/Documentation/video4linux/CARDLIST.tuner b/linux/Documentation/video4linux/CARDLIST.tuner index f3302e1b1..f5876be65 100644 --- a/linux/Documentation/video4linux/CARDLIST.tuner +++ b/linux/Documentation/video4linux/CARDLIST.tuner @@ -64,3 +64,4 @@ tuner=62 - Philips TEA5767HN FM Radio tuner=63 - Philips FMD1216ME MK3 Hybrid Tuner tuner=64 - LG TDVS-H062F/TUA6034 tuner=65 - Ymec TVF66T5-B/DFF +tuner=66 - LG NTSC (TALN mini series) diff --git a/linux/drivers/media/common/ir-common.c b/linux/drivers/media/common/ir-common.c index f16303dab..d1b17168b 100644 --- a/linux/drivers/media/common/ir-common.c +++ b/linux/drivers/media/common/ir-common.c @@ -1,5 +1,5 @@ /* - * $Id: ir-common.c,v 1.13 2005/08/09 19:05:26 mchehab Exp $ + * $Id: ir-common.c,v 1.14 2005/08/10 15:16:31 mkrufky Exp $ * * some common structs and functions to handle infrared remotes via * input layer ... @@ -428,7 +428,7 @@ int ir_decode_pulsedistance(u32 *samples, int count, int low, int high) } /* silence to short */ - if (len < 7) + if (len < 7) return 0xffffffff; /* go decoding */ diff --git a/linux/drivers/media/video/cx88/cx88-input.c b/linux/drivers/media/video/cx88/cx88-input.c index 94abdea17..efdf092bf 100644 --- a/linux/drivers/media/video/cx88/cx88-input.c +++ b/linux/drivers/media/video/cx88/cx88-input.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-input.c,v 1.16 2005/08/09 19:05:26 mchehab Exp $ + * $Id: cx88-input.c,v 1.17 2005/08/10 15:16:31 mkrufky Exp $ * * Device driver for GPIO attached remote control interfaces * on Conexant 2388x based TV/DVB cards. @@ -232,12 +232,12 @@ static IR_KEYTAB_TYPE ir_codes_cinergy_1400[IR_KEYTAB_SIZE] = { [0x0f] = KEY_EPG, [0x10] = KEY_UP, [0x11] = KEY_LEFT, - [0x12] = KEY_OK, + [0x12] = KEY_OK, [0x13] = KEY_RIGHT, [0x14] = KEY_DOWN, [0x15] = KEY_TEXT, - [0x16] = KEY_INFO, - + [0x16] = KEY_INFO, + [0x17] = KEY_RED, [0x18] = KEY_GREEN, [0x19] = KEY_YELLOW, |