diff --git a/[refs] b/[refs]
index 38e752f2dcb9..a144b60204ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b20aeccd6ad42ccb6be1b3d1d32618ddd2b31bf0
+refs/heads/master: 0261ac5f2f43a1906cfacfb19d62ed643d162cbe
diff --git a/trunk/include/xen/hvc-console.h b/trunk/include/xen/hvc-console.h
index fd5483a059bb..98b79bc404dd 100644
--- a/trunk/include/xen/hvc-console.h
+++ b/trunk/include/xen/hvc-console.h
@@ -3,7 +3,11 @@
 
 extern struct console xenboot_console;
 
+#ifdef CONFIG_HVC_XEN
 void xen_console_resume(void);
+#else
+static inline void xen_console_resume(void) { }
+#endif
 
 void xen_raw_console_write(const char *str);
 void xen_raw_printk(const char *fmt, ...);