]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
CONFIG_PM_SLEEP fix: xen: fix compilation when CONFIG_PM_SLEEP is disabled
authorJeremy Fitzhardinge <jeremy@goop.org>
Thu, 29 May 2008 08:02:19 +0000 (09:02 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 2 Jun 2008 10:14:16 +0000 (12:14 +0200)
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>
drivers/xen/manage.c

index 675c3dd23962ff45fa6c058250bbb0c834085be1..5b546e365f007d028843eea0ee84e77a0def1f58 100644 (file)
@@ -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 @@ out:
 #endif
        shutting_down = SHUTDOWN_INVALID;
 }
+#endif /* CONFIG_PM_SLEEP */
 
 static void shutdown_handler(struct xenbus_watch *watch,
                             const char **vec, unsigned int len)