diff --git a/[refs] b/[refs] index a144b60204ed..9345fcf90552 100644 --- 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 index 675c3dd23962..5b546e365f00 100644 --- 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)