From a77702ae620187b021ef45937c8f2769c8ebc17f Mon Sep 17 00:00:00 2001 From: Henrik Kretzschmar Date: Mon, 24 May 2010 14:33:59 -0700 Subject: [PATCH] --- yaml --- r: 198339 b: refs/heads/master c: ad1458464cbbe6935be6e20d70920301733158af h: refs/heads/master i: 198337: 14ad37ce4022d820c861d41ae63958037492e269 198335: c65c4f4ff2c601919d6843e6af48d07baf7a1297 v: v3 --- [refs] | 2 +- trunk/drivers/video/vga16fb.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 43d61ca27ac2..de5f36c2b852 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3cc04971661e37e7de6fbf9808ede554b5e1cb4e +refs/heads/master: ad1458464cbbe6935be6e20d70920301733158af diff --git a/trunk/drivers/video/vga16fb.c b/trunk/drivers/video/vga16fb.c index 149c47ac7e93..28ccab44a391 100644 --- a/trunk/drivers/video/vga16fb.c +++ b/trunk/drivers/video/vga16fb.c @@ -65,7 +65,7 @@ struct vga16fb_par { /* --------------------------------------------------------------------- */ -static struct fb_var_screeninfo vga16fb_defined __initdata = { +static struct fb_var_screeninfo vga16fb_defined __devinitdata = { .xres = 640, .yres = 480, .xres_virtual = 640, @@ -85,7 +85,7 @@ static struct fb_var_screeninfo vga16fb_defined __initdata = { }; /* name should not depend on EGA/VGA */ -static struct fb_fix_screeninfo vga16fb_fix __initdata = { +static struct fb_fix_screeninfo vga16fb_fix __devinitdata = { .id = "VGA16 VGA", .smem_start = VGA_FB_PHYS, .smem_len = VGA_FB_PHYS_LEN, @@ -1287,7 +1287,7 @@ static struct fb_ops vga16fb_ops = { }; #ifndef MODULE -static int vga16fb_setup(char *options) +static int __init vga16fb_setup(char *options) { char *this_opt; @@ -1393,7 +1393,7 @@ static int __devinit vga16fb_probe(struct platform_device *dev) return ret; } -static int vga16fb_remove(struct platform_device *dev) +static int __devexit vga16fb_remove(struct platform_device *dev) { struct fb_info *info = platform_get_drvdata(dev); @@ -1405,7 +1405,7 @@ static int vga16fb_remove(struct platform_device *dev) static struct platform_driver vga16fb_driver = { .probe = vga16fb_probe, - .remove = vga16fb_remove, + .remove = __devexit_p(vga16fb_remove), .driver = { .name = "vga16fb", },