summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Krufky <devnull@localhost>2006-01-21 17:18:51 +0000
committerMichael Krufky <devnull@localhost>2006-01-21 17:18:51 +0000
commit02f5cd011d5d03fb2b286f74b7fc5ef13db50d75 (patch)
tree6634e922b47abdf64dd5bc682cdd15de7d89b3d8
parent712b4d432d5f78d72722256a87c553c324a75539 (diff)
downloadmediapointer-dvb-s2-02f5cd011d5d03fb2b286f74b7fc5ef13db50d75.tar.gz
mediapointer-dvb-s2-02f5cd011d5d03fb2b286f74b7fc5ef13db50d75.tar.bz2
From: Ian Pickworth <ian@pickworth.me.uk>
Recognise Hauppauge card #34519 Signed-off-by: Ian Pickworth <ian@pickworth.me.uk> Signed-off-by: Michael Krufky <mkrufky@m1k.net>
-rw-r--r--linux/drivers/media/video/cx88/cx88-cards.c3
-rw-r--r--v4l/ChangeLog8
2 files changed, 10 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c
index 951d0b057..572a8464f 100644
--- a/linux/drivers/media/video/cx88/cx88-cards.c
+++ b/linux/drivers/media/video/cx88/cx88-cards.c
@@ -1,5 +1,5 @@
/*
- * $Id: cx88-cards.c,v 1.120 2006/01/17 05:50:23 mkrufky Exp $
+ * $Id: cx88-cards.c,v 1.121 2006/01/21 17:18:51 mkrufky Exp $
*
* device driver for Conexant 2388x based TV cards
* card-specific stuff.
@@ -1300,6 +1300,7 @@ static void hauppauge_eeprom(struct cx88_core *core, u8 *eeprom_data)
switch (tv.model)
{
case 28552: /* WinTV-PVR 'Roslyn' (No IR) */
+ case 34519: /* WinTV-PCI-FM */
case 90002: /* Nova-T-PCI (9002) */
case 92001: /* Nova-S-Plus (Video and IR) */
case 92002: /* Nova-S-Plus (Video and IR) */
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index e774822d1..2328945a2 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,11 @@
+2006-01-21 17:16 mkrufky
+
+ * linux/drivers/media/video/cx88/cx88-cards.c: (hauppauge_eeprom):
+ -Recognise Hauppauge card #34519
+
+ Signed-off-by: Ian Pickworth <ian@pickworth.me.uk>
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2006-01-21 16:51 mkrufky
* v4l/Makefile: