diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-12 17:18:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-12 17:18:05 -0700 |
| commit | aaa119a3d4e0b7421c82ae3fbe288e65d0f3485f (patch) | |
| tree | 134923311a0ec019a1365f3ed87ffe32dae37f19 /drivers/xen | |
| parent | 6faf9a54156fb4d01d73344cc90cb52dda074433 (diff) | |
| parent | d419e4c0f7584ffc5c72d9aeeaac485cc756ebcf (diff) | |
| download | linux-stable-aaa119a3d4e0b7421c82ae3fbe288e65d0f3485f.tar.gz linux-stable-aaa119a3d4e0b7421c82ae3fbe288e65d0f3485f.tar.bz2 linux-stable-aaa119a3d4e0b7421c82ae3fbe288e65d0f3485f.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
fix XEN_SAVE_RESTORE Kconfig dependencies
PM / Hibernate: Introduce CONFIG_HIBERNATE_CALLBACKS
Diffstat (limited to 'drivers/xen')
| -rw-r--r-- | drivers/xen/manage.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c index 95143dd6904d..1ac94125bf93 100644 --- a/drivers/xen/manage.c +++ b/drivers/xen/manage.c @@ -61,7 +61,7 @@ static void xen_post_suspend(int cancelled) xen_mm_unpin_all(); } -#ifdef CONFIG_HIBERNATION +#ifdef CONFIG_HIBERNATE_CALLBACKS static int xen_suspend(void *data) { struct suspend_info *si = data; @@ -173,7 +173,7 @@ out: #endif shutting_down = SHUTDOWN_INVALID; } -#endif /* CONFIG_HIBERNATION */ +#endif /* CONFIG_HIBERNATE_CALLBACKS */ struct shutdown_handler { const char *command; @@ -202,7 +202,7 @@ static void shutdown_handler(struct xenbus_watch *watch, { "poweroff", do_poweroff }, { "halt", do_poweroff }, { "reboot", do_reboot }, -#ifdef CONFIG_HIBERNATION +#ifdef CONFIG_HIBERNATE_CALLBACKS { "suspend", do_suspend }, #endif {NULL, NULL}, |