Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / include / xen / hvc-console.h

diff --git a/include/xen/hvc-console.h b/include/xen/hvc-console.h
index fd5483a059bb44ec8ab375871acdc9aef1de87be..c3adde32669b49f958b816a5b3b6e757b25a078e 100644 (file)
--- a/include/xen/hvc-console.h
+++ b/include/xen/hvc-console.h
@@ -3,9 +3,14 @@
 
 extern struct console xenboot_console;
 
+#ifdef CONFIG_HVC_XEN
 void xen_console_resume(void);
-
 void xen_raw_console_write(const char *str);
 void xen_raw_printk(const char *fmt, ...);
+#else
+static inline void xen_console_resume(void) { }
+static inline void xen_raw_console_write(const char *str) { }
+static inline void xen_raw_printk(const char *fmt, ...) { }
+#endif
 
 #endif /* XEN_HVC_CONSOLE_H */