summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx88/cx88-input.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-03-09 22:56:59 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-09 22:56:59 -0300
commita9e5a96e3a38b1089b19496b26ebfd6d308d48e3 (patch)
tree41835b4264bb6ad7af269818771d44266b526c22 /linux/drivers/media/video/cx88/cx88-input.c
parent2af26e6a68740096134e432bc8b0fbf46cbd0a27 (diff)
parent8edb4b5501818f40fd0c88d29df0cfb28edabb99 (diff)
downloadmediapointer-dvb-s2-a9e5a96e3a38b1089b19496b26ebfd6d308d48e3.tar.gz
mediapointer-dvb-s2-a9e5a96e3a38b1089b19496b26ebfd6d308d48e3.tar.bz2
merge: http://linuxtv.org/hg/~mkrufky/saa7134
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-input.c')
-rw-r--r--linux/drivers/media/video/cx88/cx88-input.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-input.c b/linux/drivers/media/video/cx88/cx88-input.c
index bcecb5bbd..dbb6ee2d9 100644
--- a/linux/drivers/media/video/cx88/cx88-input.c
+++ b/linux/drivers/media/video/cx88/cx88-input.c
@@ -239,6 +239,8 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
case CX88_BOARD_HAUPPAUGE_HVR3000:
case CX88_BOARD_HAUPPAUGE_HVR4000:
case CX88_BOARD_HAUPPAUGE_HVR4000LITE:
+ case CX88_BOARD_PCHDTV_HD3000:
+ case CX88_BOARD_PCHDTV_HD5500:
ir_codes = ir_codes_hauppauge_new;
ir_type = IR_TYPE_RC5;
ir->sampling = 1;
@@ -483,6 +485,8 @@ void cx88_ir_irq(struct cx88_core *core)
case CX88_BOARD_HAUPPAUGE_HVR3000:
case CX88_BOARD_HAUPPAUGE_HVR4000:
case CX88_BOARD_HAUPPAUGE_HVR4000LITE:
+ case CX88_BOARD_PCHDTV_HD3000:
+ case CX88_BOARD_PCHDTV_HD5500:
ircode = ir_decode_biphase(ir->samples, ir->scount, 5, 7);
ir_dprintk("biphase decoded: %x\n", ircode);
/*