Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

[sfrench/cifs-2.6.git] / include / linux / console.h

diff --git a/include/linux/console.h b/include/linux/console.h
index 3bdf2155e565ce1a1e4d2cdeb5b7bbfa03ff3de9..7d0420274de00d26b86d6d986631860bb158d5d3 100644 (file)
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -120,9 +120,17 @@ extern void console_stop(struct console *);
 extern void console_start(struct console *);
 extern int is_console_locked(void);
 
+#ifndef CONFIG_DISABLE_CONSOLE_SUSPEND
 /* Suspend and resume console messages over PM events */
 extern void suspend_console(void);
 extern void resume_console(void);
+#else
+static inline void suspend_console(void) {}
+static inline void resume_console(void) {}
+#endif /* CONFIG_DISABLE_CONSOLE_SUSPEND */
+
+int mda_console_init(void);
+void prom_con_init(void);
 
 /* Some debug stub to catch some of the obvious races in the VT code */
 #if 1