---

yaml --- r: 99563 b: refs/heads/master c: c782772 h: refs/heads/master i: 99561: 06994de 99559: 135e880 v: v3
git-mirror · Jun 2, 2008 · c7ca755 · c7ca755
1 parent d6dcc5d
commit c7ca755
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: 0261ac5f2f43a1906cfacfb19d62ed643d162cbe
+refs/heads/master: c78277288e3d561d55fb48bc0fe8d6e2cf4d0880
diff --git a/trunk/drivers/xen/manage.c b/trunk/drivers/xen/manage.c
@@ -31,6 +31,7 @@ enum shutdown_state {
 /* Ignore multiple shutdown requests. */
 static enum shutdown_state shutting_down = SHUTDOWN_INVALID;
 
+#ifdef CONFIG_PM_SLEEP
 static int xen_suspend(void *data)
 {
 	int *cancelled = data;
@@ -121,6 +122,7 @@ static void do_suspend(void)
 #endif
 	shutting_down = SHUTDOWN_INVALID;
 }
+#endif	/* CONFIG_PM_SLEEP */
 
 static void shutdown_handler(struct xenbus_watch *watch,
 			     const char **vec, unsigned int len)