Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=b00fff0be5655614bb18a4b1d6e33b27c56c6f7e
Commit: b00fff0be5655614bb18a4b1d6e33b27c56c6f7e
Parent: 68370cf94e2511aeda3b7cb8490692570a8c9dab
Author: Michael Krufky <[EMAIL PROTECTED]>
AuthorDate: Thu Dec 27 22:19:31 2007 -0300
Committer: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Fri Jan 25 19:04:29 2008 -0200
V4L/DVB (6935): cx23885: add missing subsystem IDs for Hauppauge HVR1500
Retail
Signed-off-by: Michael Krufky <[EMAIL PROTECTED]>
Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
Documentation/video4linux/CARDLIST.cx23885 | 4 ++--
drivers/media/video/cx23885/cx23885-cards.c | 8 ++++++++
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/Documentation/video4linux/CARDLIST.cx23885
b/Documentation/video4linux/CARDLIST.cx23885
index 302c84f..0924e6e 100644
--- a/Documentation/video4linux/CARDLIST.cx23885
+++ b/Documentation/video4linux/CARDLIST.cx23885
@@ -3,5 +3,5 @@
2 -> Hauppauge WinTV-HVR1800
[0070:7800,0070:7801,0070:7809]
3 -> Hauppauge WinTV-HVR1250 [0070:7911]
4 -> DViCO FusionHDTV5 Express [18ac:d500]
- 5 -> Hauppauge WinTV-HVR1500Q [0070:7797]
- 6 -> Hauppauge WinTV-HVR1500 [0070:7717]
+ 5 -> Hauppauge WinTV-HVR1500Q
[0070:7790,0070:7797]
+ 6 -> Hauppauge WinTV-HVR1500
[0070:7710,0070:7717]
diff --git a/drivers/media/video/cx23885/cx23885-cards.c
b/drivers/media/video/cx23885/cx23885-cards.c
index 4068695..82af448 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -158,10 +158,18 @@ struct cx23885_subid cx23885_subids[] = {
.card = CX23885_BOARD_DVICO_FUSIONHDTV_5_EXP,
},{
.subvendor = 0x0070,
+ .subdevice = 0x7790,
+ .card = CX23885_BOARD_HAUPPAUGE_HVR1500Q,
+ },{
+ .subvendor = 0x0070,
.subdevice = 0x7797,
.card = CX23885_BOARD_HAUPPAUGE_HVR1500Q,
},{
.subvendor = 0x0070,
+ .subdevice = 0x7710,
+ .card = CX23885_BOARD_HAUPPAUGE_HVR1500,
+ },{
+ .subvendor = 0x0070,
.subdevice = 0x7717,
.card = CX23885_BOARD_HAUPPAUGE_HVR1500,
},
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
