Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 765
b: refs/heads/master
c: 10e9206
h: refs/heads/master
i:
  763: d1a3414
v: v3
  • Loading branch information
Peter Missel authored and Linus Torvalds committed May 1, 2005
1 parent b65f723 commit e3b766c
Show file tree
Hide file tree
Showing 2 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: fe55c452368af263a9beec38ed29f6be85280524
refs/heads/master: 10e92060295ded7b8feac1ee57bb2135ea9ac207
8 changes: 7 additions & 1 deletion trunk/drivers/media/video/saa7134/saa7134-cards.c
Original file line number Diff line number Diff line change
Expand Up @@ -1628,9 +1628,15 @@ struct pci_device_id saa7134_pci_tbl[] = {
},{
.vendor = PCI_VENDOR_ID_PHILIPS,
.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
.subvendor = 0x5168,
.subvendor = 0x5168, /* Animation Technologies (LifeView) */
.subdevice = 0x0214, /* Standard PCI, LR214WF */
.driver_data = SAA7134_BOARD_FLYTVPLATINUM_FM,
},{
.vendor = PCI_VENDOR_ID_PHILIPS,
.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
.subvendor = 0x1489, /* KYE */
.subdevice = 0x0214, /* Genius VideoWonder ProTV */
.driver_data = SAA7134_BOARD_FLYTVPLATINUM_FM, /* is an LR214WF actually */
},{
.vendor = PCI_VENDOR_ID_PHILIPS,
.device = PCI_DEVICE_ID_PHILIPS_SAA7134,
Expand Down

0 comments on commit e3b766c

Please sign in to comment.