Merge to Fedora Core 2 kernel-2.6.8-1.521

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

diff --git a/include/linux/console.h b/include/linux/console.h
index 488678c..d507775 100644 (file)
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -19,6 +19,7 @@
 
 struct vc_data;
 struct console_font_op;
+struct console_font;
 struct module;
 
 /*
@@ -40,7 +41,10 @@ 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_op)(struct vc_data *, struct console_font_op *);
+       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_resize)(struct vc_data *, unsigned int, unsigned int);
        int     (*con_set_palette)(struct vc_data *, unsigned char *);
        int     (*con_scrolldelta)(struct vc_data *, int);