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

[pandora-kernel.git] / include / linux / console.h

diff --git a/include/linux/console.h b/include/linux/console.h
index 56a7bcd..a4f27fb 100644 (file)
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -45,7 +45,8 @@ struct consw {
        int     (*con_font_get)(struct vc_data *, struct console_font *);
        int     (*con_font_default)(struct vc_data *, struct console_font *, char *);
        int     (*con_font_copy)(struct vc_data *, int);
-       int     (*con_resize)(struct vc_data *, unsigned int, unsigned int);
+       int     (*con_resize)(struct vc_data *, unsigned int, unsigned int,
+                              unsigned int);
        int     (*con_set_palette)(struct vc_data *, unsigned char *);
        int     (*con_scrolldelta)(struct vc_data *, int);
        int     (*con_set_origin)(struct vc_data *);
@@ -90,6 +91,7 @@ void give_up_console(const struct consw *sw);
 #define CON_ENABLED    (4)
 #define CON_BOOT       (8)
 #define CON_ANYTIME    (16) /* Safe to call when cpu is offline */
+#define CON_BRL                (32) /* Used for a braille device */
 
 struct console {
        char    name[16];
@@ -120,15 +122,15 @@ extern struct tty_driver *console_device(int *);
 extern void console_stop(struct console *);
 extern void console_start(struct console *);
 extern int is_console_locked(void);
+extern int braille_register_console(struct console *, int index,
+               char *console_options, char *braille_options);
+extern int braille_unregister_console(struct console *);
+
+extern int console_suspend_enabled;
 
-#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);