diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 07:58:41 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 07:58:41 +0100 |
| commit | fce45c1c8a6b5334fa88bbb9b1496b0699d3fef0 (patch) | |
| tree | cba2597077cf33d122f8d771bf84618cc5374cf6 /drivers/net/ne2k-pci.c | |
| parent | Merge branch 'master' (diff) | |
| parent | Merge branch 'master' (diff) | |
| download | linux-fce45c1c8a6b5334fa88bbb9b1496b0699d3fef0.tar.xz linux-fce45c1c8a6b5334fa88bbb9b1496b0699d3fef0.zip | |
Merge branch 'upstream'
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) 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); |