From 823ab17f7d9c9e6c2cf3690777ad91c335ab6f31 Mon Sep 17 00:00:00 2001
From: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Sat, 25 Feb 2012 19:09:40 -0500
Subject: [PATCH] --- yaml --- r: 289475 b: refs/heads/master c:
 87364624e2dd07c387b13e2ce0fda33448ef4247 h: refs/heads/master i:   289473:
 ba96cbb294aa8e4c366b04e44765fe743ce6caff   289471:
 504d920ab60cbc9c1d9989bec575bc28109cc5fa v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/usb/core/hcd-pci.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7db34a654c02..9b47158a5baa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 656d2b3964a9d0f9864d472f8dfa2dd7dd42e6c0
+refs/heads/master: 87364624e2dd07c387b13e2ce0fda33448ef4247
diff --git a/trunk/drivers/usb/core/hcd-pci.c b/trunk/drivers/usb/core/hcd-pci.c
index 81e2c0d9c17d..622b4a48e732 100644
--- a/trunk/drivers/usb/core/hcd-pci.c
+++ b/trunk/drivers/usb/core/hcd-pci.c
@@ -380,6 +380,7 @@ static int check_root_hub_suspended(struct device *dev)
 	return 0;
 }
 
+#if defined(CONFIG_PM_SLEEP) || defined(CONFIG_PM_RUNTIME)
 static int suspend_common(struct device *dev, bool do_wakeup)
 {
 	struct pci_dev		*pci_dev = to_pci_dev(dev);
@@ -471,6 +472,7 @@ static int resume_common(struct device *dev, int event)
 	}
 	return retval;
 }
+#endif	/* SLEEP || RUNTIME */
 
 #ifdef	CONFIG_PM_SLEEP