---

yaml --- r: 289475 b: refs/heads/master c: 8736462 h: refs/heads/master i: 289473: ba96cbb 289471: 504d920 v: v3
git-mirror · Feb 28, 2012 · 823ab17 · 823ab17
1 parent f1ae9e4
commit 823ab17
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: 656d2b3964a9d0f9864d472f8dfa2dd7dd42e6c0
+refs/heads/master: 87364624e2dd07c387b13e2ce0fda33448ef4247
diff --git 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