This commit was manufactured by cvs2svn to create tag

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

diff --git a/include/linux/console.h b/include/linux/console.h
index d507775..c8a8fe4 100644 (file)
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -19,7 +19,6 @@
 
 struct vc_data;
 struct console_font_op;
-struct console_font;
 struct module;
 
 /*
@@ -41,10 +40,7 @@ struct consw {
        void    (*con_bmove)(struct vc_data *, int, int, int, int, int, int);
        int     (*con_switch)(struct vc_data *);
        int     (*con_blank)(struct vc_data *, int, int);
-       int     (*con_font_set)(struct vc_data *, struct console_font *, unsigned);
-       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_font_op)(struct vc_data *, struct console_font_op *);
        int     (*con_resize)(struct vc_data *, unsigned int, unsigned int);
        int     (*con_set_palette)(struct vc_data *, unsigned char *);
        int     (*con_scrolldelta)(struct vc_data *, int);
@@ -108,9 +104,6 @@ extern void acquire_console_sem(void);
 extern void release_console_sem(void);
 extern void console_conditional_schedule(void);
 extern void console_unblank(void);
-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);
 
 /* Some debug stub to catch some of the obvious races in the VT code */