From ed6b942fb75920d6888ed6958b9ed460700f679a Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Thu, 19 May 2011 18:44:41 -0400
Subject: [PATCH] --- yaml --- r: 247737 b: refs/heads/master c:
 d187c1aab8d30771bb781c745b150f6159467d6f h: refs/heads/master i:   247735:
 64ebf86f67fe5b2c60cd439c8d346036c5ed8d8d v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/atl1c/atl1c_main.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 05ece4491efc..d490bdb4494f 100644
--- 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
index 48868de386a0..1269ba5d6e56 100644
--- 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)
 {