From a83c24f33622b86c3cb2a53f959a042d67ab7258 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Wed, 25 Dec 2002 23:27:03 -0800 Subject: [FB] Fix minor typos wrt readq/writeq support on 64-bit targets. --- include/linux/fb.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/linux/fb.h') diff --git a/include/linux/fb.h b/include/linux/fb.h index 23dd4c02ddec..188da2f94589 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -424,9 +424,11 @@ struct fb_info { #define fb_readb __raw_readb #define fb_readw __raw_readw #define fb_readl __raw_readl +#define fb_readq __raw_readq #define fb_writeb __raw_writeb #define fb_writew __raw_writew #define fb_writel __raw_writel +#define fb_writeq __raw_writeq #define fb_memset memset_io #else -- cgit v1.2.3 From acdc277a1ab96e584127f465c9323d0ae8a3f47a Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Thu, 26 Dec 2002 23:04:08 -0800 Subject: [FB] fb_blank is an fbops hook, not a standalone function. --- drivers/video/console/fbcon.c | 2 +- include/linux/fb.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'include/linux/fb.h') diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index 6b3bc39bc559..6933d2d3d39c 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c @@ -1993,7 +1993,7 @@ static int fbcon_blank(struct vc_data *vc, int blank) update_screen(vc->vc_num); return 0; } else - return fb_blank(blank, info); + return info->fbops->fb_blank(blank, info); } static void fbcon_free_font(struct display *p) diff --git a/include/linux/fb.h b/include/linux/fb.h index 188da2f94589..1edbaf1b14be 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -449,7 +449,6 @@ struct fb_info { extern int fb_set_var(struct fb_var_screeninfo *var, struct fb_info *info); extern int fb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info); -extern int fb_blank(int blank, struct fb_info *info); extern int soft_cursor(struct fb_info *info, struct fb_cursor *cursor); extern void cfb_fillrect(struct fb_info *info, struct fb_fillrect *rect); extern void cfb_copyarea(struct fb_info *info, struct fb_copyarea *area); -- cgit v1.2.3 From 6c56ca7bd3310403f595c5329e3b468acc0639fd Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Fri, 27 Dec 2002 00:15:49 -0800 Subject: Cset exclude: rth@are.twiddle.net|ChangeSet|20021227230408|33498 --- drivers/video/console/fbcon.c | 2 +- include/linux/fb.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'include/linux/fb.h') diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index 6933d2d3d39c..6b3bc39bc559 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c @@ -1993,7 +1993,7 @@ static int fbcon_blank(struct vc_data *vc, int blank) update_screen(vc->vc_num); return 0; } else - return info->fbops->fb_blank(blank, info); + return fb_blank(blank, info); } static void fbcon_free_font(struct display *p) diff --git a/include/linux/fb.h b/include/linux/fb.h index 1edbaf1b14be..188da2f94589 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -449,6 +449,7 @@ struct fb_info { extern int fb_set_var(struct fb_var_screeninfo *var, struct fb_info *info); extern int fb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info); +extern int fb_blank(int blank, struct fb_info *info); extern int soft_cursor(struct fb_info *info, struct fb_cursor *cursor); extern void cfb_fillrect(struct fb_info *info, struct fb_fillrect *rect); extern void cfb_copyarea(struct fb_info *info, struct fb_copyarea *area); -- cgit v1.2.3