---

yaml --- r: 369254 b: refs/heads/master c: 98d2f0e h: refs/heads/master v: v3
git-mirror · Apr 16, 2013 · e535640 · e535640
1 parent 8c46f94
commit e535640
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 264f0ef766d6e9fcc1b4c3afd288a20ee05ef541
+refs/heads/master: 98d2f0e68c4de36c56fbe3baeae30c001f012243
diff --git a/trunk/drivers/net/ethernet/atheros/atlx/atl1.c b/trunk/drivers/net/ethernet/atheros/atlx/atl1.c
@@ -2885,7 +2885,9 @@ static void atl1_shutdown(struct pci_dev *pdev)
 	struct net_device *netdev = pci_get_drvdata(pdev);
 	struct atl1_adapter *adapter = netdev_priv(netdev);
 
+#ifdef CONFIG_PM_SLEEP
 	atl1_suspend(&pdev->dev);
+#endif
 	pci_wake_from_d3(pdev, adapter->wol);
 	pci_set_power_state(pdev, PCI_D3hot);
 }