diff options
author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
commit | ff877ea80efa2015b6263766f78ee42c2a1b32f9 (patch) | |
tree | 85205005c611ab774702148558321c6fb92f1ccd /include/xen/hvc-console.h | |
parent | 30821fee4f0cb3e6d241d9f7ddc37742212e3eb7 (diff) | |
parent | d37e6bf68fc1eb34a4ad21d9ae8890ed37ea80e7 (diff) |
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
Diffstat (limited to 'include/xen/hvc-console.h')
-rw-r--r-- | include/xen/hvc-console.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/xen/hvc-console.h b/include/xen/hvc-console.h index 21c0ecfd786d..c3adde32669b 100644 --- a/include/xen/hvc-console.h +++ b/include/xen/hvc-console.h | |||
@@ -3,4 +3,14 @@ | |||
3 | 3 | ||
4 | extern struct console xenboot_console; | 4 | extern struct console xenboot_console; |
5 | 5 | ||
6 | #ifdef CONFIG_HVC_XEN | ||
7 | void xen_console_resume(void); | ||
8 | void xen_raw_console_write(const char *str); | ||
9 | void xen_raw_printk(const char *fmt, ...); | ||
10 | #else | ||
11 | static inline void xen_console_resume(void) { } | ||
12 | static inline void xen_raw_console_write(const char *str) { } | ||
13 | static inline void xen_raw_printk(const char *fmt, ...) { } | ||
14 | #endif | ||
15 | |||
6 | #endif /* XEN_HVC_CONSOLE_H */ | 16 | #endif /* XEN_HVC_CONSOLE_H */ |