This commit was manufactured by cvs2svn to create tag

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

diff --git a/drivers/video/console/fbcon.h b/drivers/video/console/fbcon.h
index ee2a15e..a89001a 100644 (file)
--- a/drivers/video/console/fbcon.h
+++ b/drivers/video/console/fbcon.h
@@ -48,26 +48,6 @@ struct display {
     struct fb_videomode *mode;
 };
 
-struct fbcon_ops {
-       void (*bmove)(struct vc_data *vc, struct fb_info *info, int sy,
-                     int sx, int dy, int dx, int height, int width);
-       void (*clear)(struct vc_data *vc, struct fb_info *info, int sy,
-                     int sx, int height, int width);
-       void (*putcs)(struct vc_data *vc, struct fb_info *info,
-                     const unsigned short *s, int count, int yy, int xx,
-                     int fg, int bg);
-       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 timer_list cursor_timer; /* Cursor timer */
-       struct fb_cursor cursor_state;
-        int    currcon;                        /* Current VC. */
-       int    cursor_flash;
-       int    cursor_reset;
-       char  *cursor_data;
-};
     /*
      *  Attribute Decoding
      */
@@ -92,13 +72,6 @@ struct fbcon_ops {
 #define attr_blink(s) \
        ((s) & 0x8000)
        
-/* Font */
-#define REFCOUNT(fd)   (((int *)(fd))[-1])
-#define FNTSIZE(fd)    (((int *)(fd))[-2])
-#define FNTCHARCNT(fd) (((int *)(fd))[-3])
-#define FNTSUM(fd)     (((int *)(fd))[-4])
-#define FONT_EXTRA_WORDS 4
-
     /*
      *  Scroll Method
      */
@@ -156,9 +129,5 @@ struct fbcon_ops {
 #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);
+
 #endif /* _VIDEO_FBCON_H */