Commit ffdab3e5 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

[PATCH] Make the tulip compile again

parent 3b798793
...@@ -2178,7 +2178,7 @@ static int de_suspend (struct pci_dev *pdev, u32 state) ...@@ -2178,7 +2178,7 @@ static int de_suspend (struct pci_dev *pdev, u32 state)
/* Update the error counts. */ /* Update the error counts. */
__de_get_stats(de); __de_get_stats(de);
synchronize_irq(); synchronize_irq(dev->irq);
de_clean_rings(de); de_clean_rings(de);
de_adapter_sleep(de); de_adapter_sleep(de);
......
...@@ -1522,7 +1522,7 @@ de4x5_sw_reset(struct net_device *dev) ...@@ -1522,7 +1522,7 @@ de4x5_sw_reset(struct net_device *dev)
outl(omr|OMR_ST, DE4X5_OMR); outl(omr|OMR_ST, DE4X5_OMR);
/* Poll for setup frame completion (adapter interrupts are disabled now) */ /* Poll for setup frame completion (adapter interrupts are disabled now) */
sti(); /* Ensure timer interrupts */
for (j=0, i=0;(i<500) && (j==0);i++) { /* Upto 500ms delay */ for (j=0, i=0;(i<500) && (j==0);i++) { /* Upto 500ms delay */
mdelay(1); mdelay(1);
if ((s32)le32_to_cpu(lp->tx_ring[lp->tx_new].status) >= 0) j=1; if ((s32)le32_to_cpu(lp->tx_ring[lp->tx_new].status) >= 0) j=1;
...@@ -1644,7 +1644,7 @@ de4x5_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -1644,7 +1644,7 @@ de4x5_interrupt(int irq, void *dev_id, struct pt_regs *regs)
if (test_and_set_bit(MASK_INTERRUPTS, (void*) &lp->interrupt)) if (test_and_set_bit(MASK_INTERRUPTS, (void*) &lp->interrupt))
printk("%s: Re-entering the interrupt handler.\n", dev->name); printk("%s: Re-entering the interrupt handler.\n", dev->name);
synchronize_irq(); synchronize_irq(dev->irq);
for (limit=0; limit<8; limit++) { for (limit=0; limit<8; limit++) {
sts = inl(DE4X5_STS); /* Read IRQ status */ sts = inl(DE4X5_STS); /* Read IRQ status */
......
...@@ -1674,7 +1674,7 @@ static int w840_suspend (struct pci_dev *pdev, u32 state) ...@@ -1674,7 +1674,7 @@ static int w840_suspend (struct pci_dev *pdev, u32 state)
spin_unlock_irq(&np->lock); spin_unlock_irq(&np->lock);
spin_unlock_wait(&dev->xmit_lock); spin_unlock_wait(&dev->xmit_lock);
synchronize_irq(); synchronize_irq(dev->irq);
np->stats.rx_missed_errors += readl(ioaddr + RxMissed) & 0xffff; np->stats.rx_missed_errors += readl(ioaddr + RxMissed) & 0xffff;
......
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