Merge branch 'upstream-fixes'

[cascardo/linux.git] / drivers / net / ne2k-pci.c

diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c
index e531a4e..e3ebb58 100644 (file)
--- a/drivers/net/ne2k-pci.c
+++ b/drivers/net/ne2k-pci.c
@@ -117,7 +117,7 @@ enum ne2k_pci_chipsets {
 };
 
 
-static struct {
+static const struct {
        char *name;
        int flags;
 } pci_clone_list[] __devinitdata = {
@@ -675,7 +675,6 @@ static int ne2k_pci_resume (struct pci_dev *pdev)
        pci_set_power_state(pdev, 0);
        pci_restore_state(pdev);
        pci_enable_device(pdev);
-       pci_set_master(pdev);
        NS8390_init(dev, 1);
        netif_device_attach(dev);