diff options
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/uvesafb.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c index b983d262ab78..d1d6c0facd54 100644 --- a/drivers/video/uvesafb.c +++ b/drivers/video/uvesafb.c | |||
@@ -926,8 +926,10 @@ static int uvesafb_setpalette(struct uvesafb_pal_entry *entries, int count, | |||
926 | int start, struct fb_info *info) | 926 | int start, struct fb_info *info) |
927 | { | 927 | { |
928 | struct uvesafb_ktask *task; | 928 | struct uvesafb_ktask *task; |
929 | #ifdef CONFIG_X86 | ||
929 | struct uvesafb_par *par = info->par; | 930 | struct uvesafb_par *par = info->par; |
930 | int i = par->mode_idx; | 931 | int i = par->mode_idx; |
932 | #endif | ||
931 | int err = 0; | 933 | int err = 0; |
932 | 934 | ||
933 | /* | 935 | /* |
@@ -1103,11 +1105,11 @@ static int uvesafb_pan_display(struct fb_var_screeninfo *var, | |||
1103 | 1105 | ||
1104 | static int uvesafb_blank(int blank, struct fb_info *info) | 1106 | static int uvesafb_blank(int blank, struct fb_info *info) |
1105 | { | 1107 | { |
1106 | struct uvesafb_par *par = info->par; | ||
1107 | struct uvesafb_ktask *task; | 1108 | struct uvesafb_ktask *task; |
1108 | int err = 1; | 1109 | int err = 1; |
1109 | |||
1110 | #ifdef CONFIG_X86 | 1110 | #ifdef CONFIG_X86 |
1111 | struct uvesafb_par *par = info->par; | ||
1112 | |||
1111 | if (par->vbe_ib.capabilities & VBE_CAP_VGACOMPAT) { | 1113 | if (par->vbe_ib.capabilities & VBE_CAP_VGACOMPAT) { |
1112 | int loop = 10000; | 1114 | int loop = 10000; |
1113 | u8 seq = 0, crtc17 = 0; | 1115 | u8 seq = 0, crtc17 = 0; |