aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy@goop.org>2008-05-29 04:02:19 -0400
committerIngo Molnar <mingo@elte.hu>2008-06-02 06:14:16 -0400
commitc78277288e3d561d55fb48bc0fe8d6e2cf4d0880 (patch)
tree315e86ee65ffbcebd331aef0544db2612a9e8b77
parent0261ac5f2f43a1906cfacfb19d62ed643d162cbe (diff)
CONFIG_PM_SLEEP fix: xen: fix compilation when CONFIG_PM_SLEEP is disabled
Xen save/restore depends on CONFIG_PM_SLEEP being set for device_power_up/down. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--drivers/xen/manage.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index 675c3dd23962..5b546e365f00 100644
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -31,6 +31,7 @@ enum shutdown_state {
31/* Ignore multiple shutdown requests. */ 31/* Ignore multiple shutdown requests. */
32static enum shutdown_state shutting_down = SHUTDOWN_INVALID; 32static enum shutdown_state shutting_down = SHUTDOWN_INVALID;
33 33
34#ifdef CONFIG_PM_SLEEP
34static int xen_suspend(void *data) 35static int xen_suspend(void *data)
35{ 36{
36 int *cancelled = data; 37 int *cancelled = data;
@@ -121,6 +122,7 @@ out:
121#endif 122#endif
122 shutting_down = SHUTDOWN_INVALID; 123 shutting_down = SHUTDOWN_INVALID;
123} 124}
125#endif /* CONFIG_PM_SLEEP */
124 126
125static void shutdown_handler(struct xenbus_watch *watch, 127static void shutdown_handler(struct xenbus_watch *watch,
126 const char **vec, unsigned int len) 128 const char **vec, unsigned int len)