From 9d2095a804078a591231bd1a75594ece48b3929f Mon Sep 17 00:00:00 2001 From: Henrik Kretzschmar Date: Mon, 24 May 2010 14:33:57 -0700 Subject: [PATCH] --- yaml --- r: 198338 b: refs/heads/master c: 3cc04971661e37e7de6fbf9808ede554b5e1cb4e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/vfb.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4d946e3937b0..43d61ca27ac2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e217e6e39f62e47f7e659b715235dbd57df480f8 +refs/heads/master: 3cc04971661e37e7de6fbf9808ede554b5e1cb4e diff --git a/trunk/drivers/video/vfb.c b/trunk/drivers/video/vfb.c index 9b5532b4de35..bc67251f1a2f 100644 --- a/trunk/drivers/video/vfb.c +++ b/trunk/drivers/video/vfb.c @@ -78,7 +78,7 @@ static void rvfree(void *mem, unsigned long size) vfree(mem); } -static struct fb_var_screeninfo vfb_default __initdata = { +static struct fb_var_screeninfo vfb_default __devinitdata = { .xres = 640, .yres = 480, .xres_virtual = 640, @@ -100,7 +100,7 @@ static struct fb_var_screeninfo vfb_default __initdata = { .vmode = FB_VMODE_NONINTERLACED, }; -static struct fb_fix_screeninfo vfb_fix __initdata = { +static struct fb_fix_screeninfo vfb_fix __devinitdata = { .id = "Virtual FB", .type = FB_TYPE_PACKED_PIXELS, .visual = FB_VISUAL_PSEUDOCOLOR,