diff options
author | Shaun Ruffell <sruffell@digium.com> | 2011-03-03 12:42:31 -0600 |
---|---|---|
committer | Shaun Ruffell <sruffell@digium.com> | 2011-04-15 14:21:14 -0500 |
commit | f900e1f229bbd4e04229052b18a1dc6cacbb0e52 (patch) | |
tree | 88000a1a498af9c4b15324a7275f50a46bf2e667 /drivers/dahdi/wcb4xxp | |
parent | 3080253725eb7a1ba1cec08735c1476a3fd3c1c7 (diff) |
dahdi: Move irq/irqmisses from dahdi_span into dahdi_device.
These fields do not have anything to do with the span.
Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Diffstat (limited to 'drivers/dahdi/wcb4xxp')
-rw-r--r-- | drivers/dahdi/wcb4xxp/base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dahdi/wcb4xxp/base.c b/drivers/dahdi/wcb4xxp/base.c index 581c486..7e80400 100644 --- a/drivers/dahdi/wcb4xxp/base.c +++ b/drivers/dahdi/wcb4xxp/base.c @@ -2474,7 +2474,6 @@ static void init_spans(struct b4xxp *b4) bspan = &b4->spans[i]; bspan->parent = b4; - bspan->span.irq = b4->pdev->irq; bspan->span.spantype = (bspan->te_mode) ? "TE" : "NT"; bspan->span.offset = i; bspan->span.channels = WCB4XXP_CHANNELS_PER_SPAN; @@ -2935,6 +2934,7 @@ static int __devinit b4xx_probe(struct pci_dev *pdev, const struct pci_device_id b4->ddev->manufacturer = "Digium"; b4->ddev->devicetype = b4->variety; + b4->ddev->irq = b4->pdev->irq; b4->ddev->location = kasprintf(GFP_KERNEL, "PCI Bus %02d Slot %02d", b4->pdev->bus->number, PCI_SLOT(b4->pdev->devfn) + 1); |