projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[linux-2.6-microblaze.git]
/
drivers
/
net
/
ne2k-pci.c
diff --git
a/drivers/net/ne2k-pci.c
b/drivers/net/ne2k-pci.c
index
e531a4e
..
d11821d
100644
(file)
--- 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);