Merge tag 'tty-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[linux-2.6-microblaze.git] / drivers / video / fbdev / core / fbcon.c

diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
index f114242..cf9ac4d 100644 (file)
--- a/drivers/video/fbdev/core/fbcon.c
+++ b/drivers/video/fbdev/core/fbcon.c
@@ -1060,9 +1060,9 @@ static void fbcon_init(struct vc_data *vc, int init)
                        vc->vc_complement_mask <<= 1;
        }
 
-       if (!*svc->vc_uni_pagedir_loc)
+       if (!*svc->uni_pagedict_loc)
                con_set_default_unimap(svc);
-       if (!*vc->vc_uni_pagedir_loc)
+       if (!*vc->uni_pagedict_loc)
                con_copy_unimap(vc, svc);
 
        ops = info->fbcon_par;
@@ -1384,9 +1384,9 @@ static void fbcon_set_disp(struct fb_info *info, struct fb_var_screeninfo *var,
                        vc->vc_complement_mask <<= 1;
        }
 
-       if (!*svc->vc_uni_pagedir_loc)
+       if (!*svc->uni_pagedict_loc)
                con_set_default_unimap(svc);
-       if (!*vc->vc_uni_pagedir_loc)
+       if (!*vc->uni_pagedict_loc)
                con_copy_unimap(vc, svc);
 
        cols = FBCON_SWAP(ops->rotate, info->var.xres, info->var.yres);