Merge branch 'bugzilla-14483' into release

[safe/jmp/linux-2.6] / include / xen / xen-ops.h

diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h
index 5d7a6db..883a21b 100644 (file)
--- a/include/xen/xen-ops.h
+++ b/include/xen/xen-ops.h
@@ -11,7 +11,7 @@ void xen_post_suspend(int suspend_cancelled);
 void xen_mm_pin_all(void);
 void xen_mm_unpin_all(void);
 
-void xen_time_suspend(void);
-void xen_time_resume(void);
+void xen_timer_resume(void);
+void xen_arch_resume(void);
 
 #endif /* INCLUDE_XEN_OPS_H */