diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 22:36:32 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 22:36:32 -0500 |
| commit | 593195f9b2309693f27b402f34573f7920b82c3e (patch) | |
| tree | 54d55557665e72e90ef35a1e0f008d381c17ed98 /drivers/media/video/cx88/cx88-input.c | |
| parent | 983d5dbdb2b38d024935f560a91cddcf704875f3 (diff) | |
| parent | f9cfc08d640e1586e76eee63cc2b0a9360bc7c7e (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Diffstat (limited to 'drivers/media/video/cx88/cx88-input.c')
| -rw-r--r-- | drivers/media/video/cx88/cx88-input.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c index 286c85b6bdf9..da2ad5c4b553 100644 --- a/drivers/media/video/cx88/cx88-input.c +++ b/drivers/media/video/cx88/cx88-input.c | |||
| @@ -697,6 +697,7 @@ void cx88_ir_irq(struct cx88_core *core) | |||
| 697 | case CX88_BOARD_HAUPPAUGE_DVB_T1: | 697 | case CX88_BOARD_HAUPPAUGE_DVB_T1: |
| 698 | case CX88_BOARD_HAUPPAUGE_NOVASE2_S1: | 698 | case CX88_BOARD_HAUPPAUGE_NOVASE2_S1: |
| 699 | case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1: | 699 | case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1: |
| 700 | case CX88_BOARD_HAUPPAUGE_HVR1100: | ||
| 700 | ircode = ir_decode_biphase(ir->samples, ir->scount, 5, 7); | 701 | ircode = ir_decode_biphase(ir->samples, ir->scount, 5, 7); |
| 701 | ir_dprintk("biphase decoded: %x\n", ircode); | 702 | ir_dprintk("biphase decoded: %x\n", ircode); |
| 702 | if ((ircode & 0xfffff000) != 0x3000) | 703 | if ((ircode & 0xfffff000) != 0x3000) |