From e2fb7cf902dbcf1a4311f53235f9dad6b240ac21 Mon Sep 17 00:00:00 2001 From: Pete Zaitcev Date: Tue, 25 Nov 2003 01:52:11 -0800 Subject: [PATCH] [SPARC]: Fix build failures in IGA frame buffer introduced by janitor changes. Most of the breakage came from cset 1.838.10.3 --- drivers/video/igafb.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/video/igafb.c b/drivers/video/igafb.c index bf7084bda436a..7e0353afb5c68 100644 --- a/drivers/video/igafb.c +++ b/drivers/video/igafb.c @@ -70,8 +70,8 @@ struct fb_info fb_info; struct fb_fix_screeninfo igafb_fix __initdata = { .id = "IGA 1682", - .type = FB_TYPE_PACKED_PIXELS; - .mmio_len = 1000; + .type = FB_TYPE_PACKED_PIXELS, + .mmio_len = 1000 }; struct fb_var_screeninfo default_var = { @@ -149,7 +149,7 @@ struct fb_var_screeninfo default_var_1280x1024 __initdata = { .xres = 1280, .yres = 1024, .xres_virtual = 1280, - .yres_virtaul = 1024, + .yres_virtual = 1024, .bits_per_pixel = 8, .red = {0, 8, 0 }, .green = {0, 8, 0 }, @@ -300,17 +300,17 @@ static int igafb_setcolreg(unsigned regno, unsigned red, unsigned green, if (regno < 16) { switch (info->var.bits_per_pixel) { case 16: - info->pseudo_palette[regno] = + ((u16*)(info->pseudo_palette))[regno] = (regno << 10) | (regno << 5) | regno; break; case 24: - info->pseudo_palette[regno] = + ((u32*)(info->pseudo_palette))[regno] = (regno << 16) | (regno << 8) | regno; break; case 32: { int i; i = (regno << 8) | regno; - info->pseudo_palette[regno] = (i << 16) | i; + ((u32*)(info->pseudo_palette))[regno] = (i << 16) | i; } break; } @@ -359,7 +359,7 @@ static int __init iga_init(struct fb_info *info, struct iga_par *par) info->fbops = &igafb_ops; 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) return 0; -- 2.53.0