From 742ca3add45cba90e16501662496d4471128b7c1 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 27 Jun 2007 14:10:00 -0700 Subject: [PATCH] --- yaml --- r: 58090 b: refs/heads/master c: 74bfe034d62ae71ad896932748de3ec8d1340809 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/chipsfb.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9dee3b32218e..2a8db22eff27 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f8738c5c5298d55ccfc26383f9f45af082a9be57 +refs/heads/master: 74bfe034d62ae71ad896932748de3ec8d1340809 diff --git a/trunk/drivers/video/chipsfb.c b/trunk/drivers/video/chipsfb.c index af313bf1a2da..f48e8c534c87 100644 --- a/trunk/drivers/video/chipsfb.c +++ b/trunk/drivers/video/chipsfb.c @@ -292,7 +292,7 @@ static void __init chips_hw_init(void) write_fr(chips_init_fr[i].addr, chips_init_fr[i].data); } -static struct fb_fix_screeninfo chipsfb_fix __initdata = { +static struct fb_fix_screeninfo chipsfb_fix __devinitdata = { .id = "C&T 65550", .type = FB_TYPE_PACKED_PIXELS, .visual = FB_VISUAL_PSEUDOCOLOR, @@ -309,7 +309,7 @@ static struct fb_fix_screeninfo chipsfb_fix __initdata = { .smem_len = 0x100000, /* 1MB */ }; -static struct fb_var_screeninfo chipsfb_var __initdata = { +static struct fb_var_screeninfo chipsfb_var __devinitdata = { .xres = 800, .yres = 600, .xres_virtual = 800, @@ -330,7 +330,7 @@ static struct fb_var_screeninfo chipsfb_var __initdata = { .vsync_len = 8, }; -static void __init init_chips(struct fb_info *p, unsigned long addr) +static void __devinit init_chips(struct fb_info *p, unsigned long addr) { memset(p->screen_base, 0, 0x100000);