From 1265684415b1d4be104d60545d4e82a3c3277b7d Mon Sep 17 00:00:00 2001 From: Henrik Kretzschmar Date: Mon, 24 May 2010 14:33:54 -0700 Subject: [PATCH] --- yaml --- r: 198336 b: refs/heads/master c: bd9b5caf8616501d2ab6f17210b11f81ea7546eb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/arcfb.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index b03fa94efd9b..41ffb4452deb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dbd536bf2f1b494240b56035ee16eba2e3d89b6a +refs/heads/master: bd9b5caf8616501d2ab6f17210b11f81ea7546eb diff --git a/trunk/drivers/video/arcfb.c b/trunk/drivers/video/arcfb.c index 8d406fb689c1..f3d7440f0072 100644 --- a/trunk/drivers/video/arcfb.c +++ b/trunk/drivers/video/arcfb.c @@ -80,7 +80,7 @@ struct arcfb_par { spinlock_t lock; }; -static struct fb_fix_screeninfo arcfb_fix __initdata = { +static struct fb_fix_screeninfo arcfb_fix __devinitdata = { .id = "arcfb", .type = FB_TYPE_PACKED_PIXELS, .visual = FB_VISUAL_MONO01, @@ -90,7 +90,7 @@ static struct fb_fix_screeninfo arcfb_fix __initdata = { .accel = FB_ACCEL_NONE, }; -static struct fb_var_screeninfo arcfb_var __initdata = { +static struct fb_var_screeninfo arcfb_var __devinitdata = { .xres = 128, .yres = 64, .xres_virtual = 128, @@ -588,7 +588,7 @@ static int __devinit arcfb_probe(struct platform_device *dev) return retval; } -static int arcfb_remove(struct platform_device *dev) +static int __devexit arcfb_remove(struct platform_device *dev) { struct fb_info *info = platform_get_drvdata(dev); @@ -602,7 +602,7 @@ static int arcfb_remove(struct platform_device *dev) static struct platform_driver arcfb_driver = { .probe = arcfb_probe, - .remove = arcfb_remove, + .remove = __devexit_p(arcfb_remove), .driver = { .name = "arcfb", },