diff options
author | Jan Frey <jfrey@gmx.de> | 2007-06-25 13:34:06 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-18 13:24:20 -0400 |
commit | 39cf1e810a6b464a8469bf318f21206d84ffb1d8 (patch) | |
tree | 40beb346b58504f511d5936ce583924f24e4e637 /drivers/media/video/cx88 | |
parent | 434b25263a236c9dd980617d69863ba0eff8c744 (diff) |
V4L/DVB (5786): Ir-kbd-i2c: add support for Hauppauge HVR1300 remote
- add support for the I2C based IR transceiver of the Hauppauge HVR-1300
- remove bad code from cx88-input.c
Signed-off-by: Jan Frey <jfrey@gmx.de>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx88')
-rw-r--r-- | drivers/media/video/cx88/cx88-input.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c index ddfae9f80ade..5915dbabd608 100644 --- a/drivers/media/video/cx88/cx88-input.c +++ b/drivers/media/video/cx88/cx88-input.c | |||
@@ -218,7 +218,6 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) | |||
218 | case CX88_BOARD_HAUPPAUGE_NOVASE2_S1: | 218 | case CX88_BOARD_HAUPPAUGE_NOVASE2_S1: |
219 | case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1: | 219 | case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1: |
220 | case CX88_BOARD_HAUPPAUGE_HVR1100: | 220 | case CX88_BOARD_HAUPPAUGE_HVR1100: |
221 | case CX88_BOARD_HAUPPAUGE_HVR1300: | ||
222 | case CX88_BOARD_HAUPPAUGE_HVR3000: | 221 | case CX88_BOARD_HAUPPAUGE_HVR3000: |
223 | ir_codes = ir_codes_hauppauge_new; | 222 | ir_codes = ir_codes_hauppauge_new; |
224 | ir_type = IR_TYPE_RC5; | 223 | ir_type = IR_TYPE_RC5; |
@@ -438,7 +437,6 @@ void cx88_ir_irq(struct cx88_core *core) | |||
438 | case CX88_BOARD_HAUPPAUGE_NOVASE2_S1: | 437 | case CX88_BOARD_HAUPPAUGE_NOVASE2_S1: |
439 | case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1: | 438 | case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1: |
440 | case CX88_BOARD_HAUPPAUGE_HVR1100: | 439 | case CX88_BOARD_HAUPPAUGE_HVR1100: |
441 | case CX88_BOARD_HAUPPAUGE_HVR1300: | ||
442 | case CX88_BOARD_HAUPPAUGE_HVR3000: | 440 | case CX88_BOARD_HAUPPAUGE_HVR3000: |
443 | ircode = ir_decode_biphase(ir->samples, ir->scount, 5, 7); | 441 | ircode = ir_decode_biphase(ir->samples, ir->scount, 5, 7); |
444 | ir_dprintk("biphase decoded: %x\n", ircode); | 442 | ir_dprintk("biphase decoded: %x\n", ircode); |