diff options
Diffstat (limited to 'drivers/telephony')
-rw-r--r-- | drivers/telephony/ixj.c | 11 | ||||
-rw-r--r-- | drivers/telephony/ixj.h | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c index f6b2948ab288..1b601b6cf2a2 100644 --- a/drivers/telephony/ixj.c +++ b/drivers/telephony/ixj.c | |||
@@ -284,6 +284,14 @@ static int samplerate = 100; | |||
284 | 284 | ||
285 | module_param(ixjdebug, int, 0); | 285 | module_param(ixjdebug, int, 0); |
286 | 286 | ||
287 | static struct pci_device_id ixj_pci_tbl[] __devinitdata = { | ||
288 | { PCI_VENDOR_ID_QUICKNET, PCI_DEVICE_ID_QUICKNET_XJ, | ||
289 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, | ||
290 | { } | ||
291 | }; | ||
292 | |||
293 | MODULE_DEVICE_TABLE(pci, ixj_pci_tbl); | ||
294 | |||
287 | /************************************************************************ | 295 | /************************************************************************ |
288 | * | 296 | * |
289 | * ixjdebug meanings are now bit mapped instead of level based | 297 | * ixjdebug meanings are now bit mapped instead of level based |
@@ -7683,7 +7691,8 @@ static int __init ixj_probe_pci(int *cnt) | |||
7683 | IXJ *j = NULL; | 7691 | IXJ *j = NULL; |
7684 | 7692 | ||
7685 | for (i = 0; i < IXJMAX - *cnt; i++) { | 7693 | for (i = 0; i < IXJMAX - *cnt; i++) { |
7686 | pci = pci_find_device(0x15E2, 0x0500, pci); | 7694 | pci = pci_find_device(PCI_VENDOR_ID_QUICKNET, |
7695 | PCI_DEVICE_ID_QUICKNET_XJ, pci); | ||
7687 | if (!pci) | 7696 | if (!pci) |
7688 | break; | 7697 | break; |
7689 | 7698 | ||
diff --git a/drivers/telephony/ixj.h b/drivers/telephony/ixj.h index fbea4541c234..8d69bcdc29c9 100644 --- a/drivers/telephony/ixj.h +++ b/drivers/telephony/ixj.h | |||
@@ -1295,7 +1295,7 @@ typedef struct { | |||
1295 | Proc_Info_Type Info_write; | 1295 | Proc_Info_Type Info_write; |
1296 | unsigned short frame_count; | 1296 | unsigned short frame_count; |
1297 | unsigned int filter_hist[4]; | 1297 | unsigned int filter_hist[4]; |
1298 | unsigned char filter_en[4]; | 1298 | unsigned char filter_en[6]; |
1299 | unsigned short proc_load; | 1299 | unsigned short proc_load; |
1300 | unsigned long framesread; | 1300 | unsigned long framesread; |
1301 | unsigned long frameswritten; | 1301 | unsigned long frameswritten; |