Commit e2fb7cf9 authored by Pete Zaitcev's avatar Pete Zaitcev Committed by David S. Miller

[SPARC]: Fix build failures in IGA frame buffer introduced by janitor changes.

Most of the breakage came from cset 1.838.10.3
parent 4eb02f5e
...@@ -70,8 +70,8 @@ struct fb_info fb_info; ...@@ -70,8 +70,8 @@ struct fb_info fb_info;
struct fb_fix_screeninfo igafb_fix __initdata = { struct fb_fix_screeninfo igafb_fix __initdata = {
.id = "IGA 1682", .id = "IGA 1682",
.type = FB_TYPE_PACKED_PIXELS; .type = FB_TYPE_PACKED_PIXELS,
.mmio_len = 1000; .mmio_len = 1000
}; };
struct fb_var_screeninfo default_var = { struct fb_var_screeninfo default_var = {
...@@ -149,7 +149,7 @@ struct fb_var_screeninfo default_var_1280x1024 __initdata = { ...@@ -149,7 +149,7 @@ struct fb_var_screeninfo default_var_1280x1024 __initdata = {
.xres = 1280, .xres = 1280,
.yres = 1024, .yres = 1024,
.xres_virtual = 1280, .xres_virtual = 1280,
.yres_virtaul = 1024, .yres_virtual = 1024,
.bits_per_pixel = 8, .bits_per_pixel = 8,
.red = {0, 8, 0 }, .red = {0, 8, 0 },
.green = {0, 8, 0 }, .green = {0, 8, 0 },
...@@ -300,17 +300,17 @@ static int igafb_setcolreg(unsigned regno, unsigned red, unsigned green, ...@@ -300,17 +300,17 @@ static int igafb_setcolreg(unsigned regno, unsigned red, unsigned green,
if (regno < 16) { if (regno < 16) {
switch (info->var.bits_per_pixel) { switch (info->var.bits_per_pixel) {
case 16: case 16:
info->pseudo_palette[regno] = ((u16*)(info->pseudo_palette))[regno] =
(regno << 10) | (regno << 5) | regno; (regno << 10) | (regno << 5) | regno;
break; break;
case 24: case 24:
info->pseudo_palette[regno] = ((u32*)(info->pseudo_palette))[regno] =
(regno << 16) | (regno << 8) | regno; (regno << 16) | (regno << 8) | regno;
break; break;
case 32: case 32:
{ int i; { int i;
i = (regno << 8) | regno; i = (regno << 8) | regno;
info->pseudo_palette[regno] = (i << 16) | i; ((u32*)(info->pseudo_palette))[regno] = (i << 16) | i;
} }
break; break;
} }
...@@ -359,7 +359,7 @@ static int __init iga_init(struct fb_info *info, struct iga_par *par) ...@@ -359,7 +359,7 @@ static int __init iga_init(struct fb_info *info, struct iga_par *par)
info->fbops = &igafb_ops; info->fbops = &igafb_ops;
info->flags = FBINFO_FLAG_DEFAULT; info->flags = FBINFO_FLAG_DEFAULT;
fb_alloc_cmap(info->cmap, video_cmap_len, 0); fb_alloc_cmap(&info->cmap, video_cmap_len, 0);
if (register_framebuffer(info) < 0) if (register_framebuffer(info) < 0)
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment