summaryrefslogtreecommitdiffstats
path: root/drivers/video/fbgen.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-06-13 16:29:25 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-06-13 16:29:25 +0000
commitdb7d4daea91e105e3859cf461d7e53b9b77454b2 (patch)
tree9bb65b95440af09e8aca63abe56970dd3360cc57 /drivers/video/fbgen.c
parent9c1c01ead627bdda9211c9abd5b758d6c687d8ac (diff)
Merge with Linux 2.2.8.
Diffstat (limited to 'drivers/video/fbgen.c')
-rw-r--r--drivers/video/fbgen.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/fbgen.c b/drivers/video/fbgen.c
index c3c42ed5e..ff14807a0 100644
--- a/drivers/video/fbgen.c
+++ b/drivers/video/fbgen.c
@@ -244,7 +244,6 @@ void fbgen_set_disp(int con, struct fb_info_gen *info)
memset(&fix, 0, sizeof(struct fb_fix_screeninfo));
fbhw->encode_fix(&fix, &par, info);
- display->screen_base = phys_to_virt((unsigned long)fix.smem_start);
display->visual = fix.visual;
display->type = fix.type;
display->type_aux = fix.type_aux;
@@ -256,7 +255,7 @@ void fbgen_set_disp(int con, struct fb_info_gen *info)
display->can_soft_blank = 1;
else
display->can_soft_blank = 0;
- fbhw->set_dispsw(&par, display, info);
+ fbhw->set_disp(&par, display, info);
#if 0 /* FIXME: generic inverse is not supported yet */
display->inverse = (fix.visual == FB_VISUAL_MONO01 ? !inverse : inverse);
#else