[PATCH] e1000: e1000 stops working after resume

e1000 stops working after resume, call pci_enable_device after pci_restore_state - Modified Andrew Morton's patch
Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c

drivers/net/e1000/e1000_main.c

@@ -3173,7 +3173,6 @@ e1000_resume(struct pci_dev *pdev)
 	pci_set_power_state(pdev, 0);
 	pci_restore_state(pdev);
 	ret = pci_enable_device(pdev);
-	if (pdev->is_busmaster)
 	pci_set_master(pdev);
 
 	pci_enable_wake(pdev, 3, 0);