git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
xen
/
manage.c
diff --git
a/drivers/xen/manage.c
b/drivers/xen/manage.c
index
95143dd
..
1ac9412
100644
(file)
--- 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();
}
xen_mm_unpin_all();
}
-#ifdef CONFIG_HIBERNAT
ION
+#ifdef CONFIG_HIBERNAT
E_CALLBACKS
static int xen_suspend(void *data)
{
struct suspend_info *si = data;
static int xen_suspend(void *data)
{
struct suspend_info *si = data;
@@
-173,7
+173,7
@@
out:
#endif
shutting_down = SHUTDOWN_INVALID;
}
#endif
shutting_down = SHUTDOWN_INVALID;
}
-#endif /* CONFIG_HIBERNAT
ION
*/
+#endif /* CONFIG_HIBERNAT
E_CALLBACKS
*/
struct shutdown_handler {
const char *command;
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 },
{ "poweroff", do_poweroff },
{ "halt", do_poweroff },
{ "reboot", do_reboot },
-#ifdef CONFIG_HIBERNAT
ION
+#ifdef CONFIG_HIBERNAT
E_CALLBACKS
{ "suspend", do_suspend },
#endif
{NULL, NULL},
{ "suspend", do_suspend },
#endif
{NULL, NULL},