vserver 2.0 rc7

[linux-2.6.git] / drivers / video / console / fbcon.h

diff --git a/drivers/video/console/fbcon.h b/drivers/video/console/fbcon.h
index befa1e7..5d37786 100644 (file)
--- a/drivers/video/console/fbcon.h
+++ b/drivers/video/console/fbcon.h
@@ -18,6 +18,8 @@
 
 #include <asm/io.h>
 
+#define FBCON_FLAGS_INIT 1
+
    /*
     *    This is the interface between the low-level console driver and the
     *    low-level frame buffer device
@@ -41,6 +43,7 @@ struct display {
     u32 grayscale;
     u32 nonstd;
     u32 accel_flags;
+    u32 rotate;
     struct fb_bitfield red;
     struct fb_bitfield green;
     struct fb_bitfield blue;
@@ -59,7 +62,7 @@ struct fbcon_ops {
        void (*clear_margins)(struct vc_data *vc, struct fb_info *info,
                              int bottom_only);
        void (*cursor)(struct vc_data *vc, struct fb_info *info,
-                      struct display *p, int mode, int fg, int bg);
+                      struct display *p, int mode, int softback_lines, int fg, int bg);
 
        struct timer_list cursor_timer; /* Cursor timer */
        struct fb_cursor cursor_state;
@@ -67,6 +70,8 @@ struct fbcon_ops {
        int    cursor_flash;
        int    cursor_reset;
        int    blank_state;
+       int    graphics;
+       int    flags;
        char  *cursor_data;
 };
     /*
@@ -156,13 +161,10 @@ struct fbcon_ops {
 #define SCROLL_REDRAW     0x004
 #define SCROLL_PAN_REDRAW  0x005
 
-extern int fb_console_init(void);
 #ifdef CONFIG_FB_TILEBLITTING
 extern void fbcon_set_tileops(struct vc_data *vc, struct fb_info *info,
                              struct display *p, struct fbcon_ops *ops);
 #endif
 extern void fbcon_set_bitops(struct fbcon_ops *ops);
 
-extern const struct consw fb_con;
-
 #endif /* _VIDEO_FBCON_H */