Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 39940
b: refs/heads/master
c: d77f09e
h: refs/heads/master
v: v3
  • Loading branch information
Ben Collins committed Oct 18, 2006
1 parent f4a5e61 commit 271c944
Show file tree
Hide file tree
Showing 2 changed files with 11 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: 012887327875915f76a6208e81fe0d67a682ec15
refs/heads/master: d77f09e51f5793583ede9733a93bd31a324d051c
11 changes: 10 additions & 1 deletion trunk/drivers/telephony/ixj.c
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,14 @@ static int samplerate = 100;

module_param(ixjdebug, int, 0);

static struct pci_device_id ixj_pci_tbl[] __devinitdata = {
{ PCI_VENDOR_ID_QUICKNET, PCI_DEVICE_ID_QUICKNET_XJ,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{ }
};

MODULE_DEVICE_TABLE(pci, ixj_pci_tbl);

/************************************************************************
*
* ixjdebug meanings are now bit mapped instead of level based
Expand Down Expand Up @@ -7683,7 +7691,8 @@ static int __init ixj_probe_pci(int *cnt)
IXJ *j = NULL;

for (i = 0; i < IXJMAX - *cnt; i++) {
pci = pci_find_device(0x15E2, 0x0500, pci);
pci = pci_find_device(PCI_VENDOR_ID_QUICKNET,
PCI_DEVICE_ID_QUICKNET_XJ, pci);
if (!pci)
break;

Expand Down

0 comments on commit 271c944

Please sign in to comment.