Commit 1a969c21 authored by Jeff Garzik's avatar Jeff Garzik

Fix tulip net driver multi-port board irq assignment

parent eca66b43
...@@ -1409,7 +1409,6 @@ static int __devinit tulip_init_one (struct pci_dev *pdev, ...@@ -1409,7 +1409,6 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
tp->timer.function = tulip_tbl[tp->chip_id].media_timer; tp->timer.function = tulip_tbl[tp->chip_id].media_timer;
dev->base_addr = ioaddr; dev->base_addr = ioaddr;
dev->irq = irq;
#ifdef CONFIG_TULIP_MWI #ifdef CONFIG_TULIP_MWI
if (!force_csr0 && (tp->flags & HAS_PCI_MWI)) if (!force_csr0 && (tp->flags & HAS_PCI_MWI))
...@@ -1553,6 +1552,7 @@ static int __devinit tulip_init_one (struct pci_dev *pdev, ...@@ -1553,6 +1552,7 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
last_phys_addr[i] = dev->dev_addr[i]; last_phys_addr[i] = dev->dev_addr[i];
last_irq = irq; last_irq = irq;
dev->irq = irq;
/* The lower four bits are the media type. */ /* The lower four bits are the media type. */
if (board_idx >= 0 && board_idx < MAX_UNITS) { if (board_idx >= 0 && board_idx < MAX_UNITS) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment