diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-29 17:49:12 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-29 17:49:12 -0400 |
commit | b0c4e148bd591629749d02a8fbc8d81c26d548cf (patch) | |
tree | 3e2142635f3dc2ceeae870ead2dceab7b9c6def1 /drivers/net/ne2k-pci.c | |
parent | 5615ca7906aefbdc3318604c89db5931d0a25910 (diff) | |
parent | be15cd72d256e5eb3261a781b8507fac83ab33f6 (diff) |
Merge branch 'master'
Diffstat (limited to 'drivers/net/ne2k-pci.c')
-rw-r--r-- | drivers/net/ne2k-pci.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c index e531a4eedfee..d11821dd86ed 100644 --- a/drivers/net/ne2k-pci.c +++ b/drivers/net/ne2k-pci.c | |||
@@ -675,7 +675,6 @@ static int ne2k_pci_resume (struct pci_dev *pdev) | |||
675 | pci_set_power_state(pdev, 0); | 675 | pci_set_power_state(pdev, 0); |
676 | pci_restore_state(pdev); | 676 | pci_restore_state(pdev); |
677 | pci_enable_device(pdev); | 677 | pci_enable_device(pdev); |
678 | pci_set_master(pdev); | ||
679 | NS8390_init(dev, 1); | 678 | NS8390_init(dev, 1); |
680 | netif_device_attach(dev); | 679 | netif_device_attach(dev); |
681 | 680 | ||