Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 103871
b: refs/heads/master
c: bfda3a0
h: refs/heads/master
i:
  103869: 081fc33
  103867: f6b865e
  103863: 0306157
  103855: 63a3103
  103839: 3dd56e2
  103807: 1a50209
v: v3
  • Loading branch information
Daniel Gimpelevich authored and Mauro Carvalho Chehab committed Jul 20, 2008
1 parent 8baf908 commit 4421a8b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a9fc52bcbeb5245b58d23c558f3e3e8f18bebbc3
refs/heads/master: bfda3a0b3276cda7f2da1dcd98bd060b60954cbb
2 changes: 1 addition & 1 deletion trunk/Documentation/video4linux/CARDLIST.saa7134
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
36 -> UPMOST PURPLE TV [12ab:0800]
37 -> Items MuchTV Plus / IT-005
38 -> Terratec Cinergy 200 TV [153b:1152]
39 -> LifeView FlyTV Platinum Mini [5168:0212,4e42:0212]
39 -> LifeView FlyTV Platinum Mini [5168:0212,4e42:0212,5169:1502]
40 -> Compro VideoMate TV PVR/FM [185b:c100]
41 -> Compro VideoMate TV Gold+ [185b:c100]
42 -> Sabrent SBT-TVFM (saa7130)
Expand Down
6 changes: 6 additions & 0 deletions trunk/drivers/media/video/saa7134/saa7134-cards.c
Original file line number Diff line number Diff line change
Expand Up @@ -5368,6 +5368,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
.subvendor = 0x185b,
.subdevice = 0xc900,
.driver_data = SAA7134_BOARD_VIDEOMATE_T750,
}, {
.vendor = PCI_VENDOR_ID_PHILIPS,
.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
.subvendor = 0x5169,
.subdevice = 0x1502,
.driver_data = SAA7134_BOARD_FLYTVPLATINUM_MINI,
}, {
.vendor = PCI_VENDOR_ID_PHILIPS,
.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
Expand Down

0 comments on commit 4421a8b

Please sign in to comment.