---

yaml --- r: 247737 b: refs/heads/master c: d187c1a h: refs/heads/master i: 247735: 64ebf86 v: v3
git-mirror · May 19, 2011 · ed6b942 · ed6b942
1 parent 84fc691
commit ed6b942
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: 2a64255019e13dd975f1487cec32b873bcb76da6
+refs/heads/master: d187c1aab8d30771bb781c745b150f6159467d6f
diff --git a/trunk/drivers/net/atl1c/atl1c_main.c b/trunk/drivers/net/atl1c/atl1c_main.c
@@ -2537,6 +2537,7 @@ static int atl1c_suspend(struct device *dev)
 	return 0;
 }
 
+#ifdef CONFIG_PM_SLEEP
 static int atl1c_resume(struct device *dev)
 {
 	struct pci_dev *pdev = to_pci_dev(dev);
@@ -2563,6 +2564,7 @@ static int atl1c_resume(struct device *dev)
 
 	return 0;
 }
+#endif
 
 static void atl1c_shutdown(struct pci_dev *pdev)
 {