This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / net / via-rhine.c

diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c
index 55a5c09..f7f77c3 100644 (file)
--- a/drivers/net/via-rhine.c
+++ b/drivers/net/via-rhine.c
@@ -193,8 +193,8 @@ static const int multicast_filter_limit = 32;
 #include <linux/mii.h>
 #include <linux/ethtool.h>
 #include <linux/crc32.h>
-#include <linux/bitops.h>
 #include <asm/processor.h>     /* Processor type for cache alignment. */
+#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
@@ -1951,13 +1951,12 @@ static int rhine_suspend(struct pci_dev *pdev, u32 state)
                return 0;
 
        netif_device_detach(dev);
-       pci_save_state(pdev);
+       pci_save_state(pdev, pdev->saved_config_space);
 
        spin_lock_irqsave(&rp->lock, flags);
        rhine_shutdown(&pdev->dev);
        spin_unlock_irqrestore(&rp->lock, flags);
 
-       free_irq(dev->irq, dev);
        return 0;
 }
 
@@ -1971,15 +1970,12 @@ static int rhine_resume(struct pci_dev *pdev)
        if (!netif_running(dev))
                return 0;
 
-        if (request_irq(dev->irq, rhine_interrupt, SA_SHIRQ, dev->name, dev))
-               printk(KERN_ERR "via-rhine %s: request_irq failed\n", dev->name);
-
        ret = pci_set_power_state(pdev, 0);
        if (debug > 1)
                printk(KERN_INFO "%s: Entering power state D0 %s (%d).\n",
                        dev->name, ret ? "failed" : "succeeded", ret);
 
-       pci_restore_state(pdev);
+       pci_restore_state(pdev, pdev->saved_config_space);
 
        spin_lock_irqsave(&rp->lock, flags);
 #ifdef USE_MMIO