diff options
Diffstat (limited to 'drivers/dahdi/wct1xxp.c')
| -rw-r--r-- | drivers/dahdi/wct1xxp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/dahdi/wct1xxp.c b/drivers/dahdi/wct1xxp.c index fdd2f3f..f2aedc1 100644 --- a/drivers/dahdi/wct1xxp.c +++ b/drivers/dahdi/wct1xxp.c @@ -760,7 +760,7 @@ static int t1xxp_software_init(struct t1xxp *wc) sprintf(wc->span.name, "WCT1/%d", wc->num); snprintf(wc->span.desc, sizeof(wc->span.desc) - 1, "%s Card %d", wc->variety, wc->num); wc->span.manufacturer = "Digium"; - zap_copy_string(wc->span.devicetype, wc->variety, sizeof(wc->span.devicetype)); + dahdi_copy_string(wc->span.devicetype, wc->variety, sizeof(wc->span.devicetype)); snprintf(wc->span.location, sizeof(wc->span.location) - 1, "PCI Bus %02d Slot %02d", wc->dev->bus->number, PCI_SLOT(wc->dev->devfn) + 1); wc->span.spanconfig = t1xxp_spanconfig; @@ -1150,7 +1150,7 @@ static void t1xxp_do_counters(struct t1xxp *wc) spin_unlock_irqrestore(&wc->lock, flags); } -ZAP_IRQ_HANDLER(t1xxp_interrupt) +DAHDI_IRQ_HANDLER(t1xxp_interrupt) { struct t1xxp *wc = dev_id; unsigned char ints; @@ -1321,7 +1321,7 @@ static int __devinit t1xxp_init_one(struct pci_dev *pdev, const struct pci_devic /* Keep track of which device we are */ pci_set_drvdata(pdev, wc); - if (request_irq(pdev->irq, t1xxp_interrupt, ZAP_IRQ_SHARED_DISABLED, "t1xxp", wc)) { + if (request_irq(pdev->irq, t1xxp_interrupt, DAHDI_IRQ_SHARED_DISABLED, "t1xxp", wc)) { printk("t1xxp: Unable to request IRQ %d\n", pdev->irq); kfree(wc); return -EIO; @@ -1410,7 +1410,7 @@ static struct pci_driver t1xxp_driver = { static int __init t1xxp_init(void) { int res; - res = zap_pci_module(&t1xxp_driver); + res = dahdi_pci_module(&t1xxp_driver); if (res) return -ENODEV; return 0; |