summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/cx88/cx88-input.c3
-rw-r--r--v4l/ChangeLog7
2 files changed, 9 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-input.c b/linux/drivers/media/video/cx88/cx88-input.c
index 000840793..c439e3b61 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.28 2006/01/05 20:59:56 mkrufky Exp $
+ * $Id: cx88-input.c,v 1.29 2006/01/10 00:01:06 pascoe Exp $
*
* Device driver for GPIO attached remote control interfaces
* on Conexant 2388x based TV/DVB cards.
@@ -705,6 +705,7 @@ void cx88_ir_irq(struct cx88_core *core)
case CX88_BOARD_HAUPPAUGE_DVB_T1:
case CX88_BOARD_HAUPPAUGE_NOVASE2_S1:
case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1:
+ case CX88_BOARD_HAUPPAUGE_HVR1100:
ircode = ir_decode_biphase(ir->samples, ir->scount, 5, 7);
ir_dprintk("biphase decoded: %x\n", ircode);
if ((ircode & 0xfffff000) != 0x3000)
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index c6ae90938..ba835abc3 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-09 23:58 pascoe
+
+ * linux/drivers/media/video/cx88/cx88-input.c: (cx88_ir_irq):
+ Add missing case preventing the operation of HVR1100 remote control.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+
2006-01-09 18:38 mkrufky
* linux/drivers/media/video/saa7134/saa7134-input.c: