diff options
Diffstat (limited to 'drivers/video/console/fbcon.h')
-rw-r--r-- | drivers/video/console/fbcon.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/video/console/fbcon.h b/drivers/video/console/fbcon.h index 6892e7ff34de..c38c3d8e7a74 100644 --- a/drivers/video/console/fbcon.h +++ b/drivers/video/console/fbcon.h | |||
@@ -62,12 +62,10 @@ struct fbcon_ops { | |||
62 | int fg, int bg); | 62 | int fg, int bg); |
63 | void (*clear_margins)(struct vc_data *vc, struct fb_info *info, | 63 | void (*clear_margins)(struct vc_data *vc, struct fb_info *info, |
64 | int bottom_only); | 64 | int bottom_only); |
65 | void (*cursor)(struct vc_data *vc, struct fb_info *info, | 65 | void (*cursor)(struct vc_data *vc, struct fb_info *info, int mode, |
66 | struct display *p, int mode, int softback_lines, | 66 | int softback_lines, int fg, int bg); |
67 | int fg, int bg); | ||
68 | int (*update_start)(struct fb_info *info); | 67 | int (*update_start)(struct fb_info *info); |
69 | int (*rotate_font)(struct fb_info *info, struct vc_data *vc, | 68 | int (*rotate_font)(struct fb_info *info, struct vc_data *vc); |
70 | struct display *p); | ||
71 | struct fb_var_screeninfo var; /* copy of the current fb_var_screeninfo */ | 69 | struct fb_var_screeninfo var; /* copy of the current fb_var_screeninfo */ |
72 | struct timer_list cursor_timer; /* Cursor timer */ | 70 | struct timer_list cursor_timer; /* Cursor timer */ |
73 | struct fb_cursor cursor_state; | 71 | struct fb_cursor cursor_state; |
@@ -173,8 +171,7 @@ struct fbcon_ops { | |||
173 | #define SCROLL_PAN_REDRAW 0x005 | 171 | #define SCROLL_PAN_REDRAW 0x005 |
174 | 172 | ||
175 | #ifdef CONFIG_FB_TILEBLITTING | 173 | #ifdef CONFIG_FB_TILEBLITTING |
176 | extern void fbcon_set_tileops(struct vc_data *vc, struct fb_info *info, | 174 | extern void fbcon_set_tileops(struct vc_data *vc, struct fb_info *info); |
177 | struct display *p, struct fbcon_ops *ops); | ||
178 | #endif | 175 | #endif |
179 | extern void fbcon_set_bitops(struct fbcon_ops *ops); | 176 | extern void fbcon_set_bitops(struct fbcon_ops *ops); |
180 | extern int soft_cursor(struct fb_info *info, struct fb_cursor *cursor); | 177 | extern int soft_cursor(struct fb_info *info, struct fb_cursor *cursor); |