Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update saa7134-cards.c #94

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update saa7134-cards.c #94

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca9ae21
Update saa7134-cards.c
AnTAVR May 23, 2014
190bcee
Merge pull request #1 from torvalds/master
AnTAVR Jun 19, 2014
afd2854
Merge pull request #2 from AnTAVR/master
AnTAVR Jun 19, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion drivers/media/pci/saa7134/saa7134-cards.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6547,7 +6547,7 @@ struct pci_device_id saa7134_pci_tbl[] = {
.driver_data = SAA7134_BOARD_AVERMEDIA_STUDIO_507,
},{
.vendor = PCI_VENDOR_ID_PHILIPS,
.device = PCI_DEVICE_ID_PHILIPS_SAA7134,
.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
.subvendor = 0x1461, /* Avermedia Technologies Inc */
.subdevice = 0xa11b,
.driver_data = SAA7134_BOARD_AVERMEDIA_STUDIO_507UA,
Expand Down Expand Up @@ -7424,6 +7424,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
case SAA7134_BOARD_AVERMEDIA_STUDIO_307:
case SAA7134_BOARD_AVERMEDIA_307:
case SAA7134_BOARD_AVERMEDIA_STUDIO_507:
case SAA7134_BOARD_AVERMEDIA_STUDIO_507UA:
case SAA7134_BOARD_AVERMEDIA_GO_007_FM:
case SAA7134_BOARD_AVERMEDIA_777:
case SAA7134_BOARD_AVERMEDIA_M135A:
Expand Down