Merge commit 'upstream/master'

[pandora-kernel.git] / arch / x86 / xen / suspend.c

diff --git a/arch/x86/xen/suspend.c b/arch/x86/xen/suspend.c
index 7ab10f6..2a234db 100644 (file)
--- a/arch/x86/xen/suspend.c
+++ b/arch/x86/xen/suspend.c
@@ -42,3 +42,7 @@ void xen_post_suspend(int suspend_cancelled)
 
 }
 
+void xen_arch_resume(void)
+{
+       /* nothing */
+}