diff options
author | Henrik Kretzschmar <henne@nachtwindheim.de> | 2010-05-24 17:34:09 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-25 11:07:09 -0400 |
commit | bf87eae94880f1b79c2828d8705f0d97e961f168 (patch) | |
tree | 8d16b4147d4617d33a9e2b58a57bfe108afca7e3 | |
parent | a42dcb883d948a5f26c005f0e401e8297aa05f76 (diff) |
auxdisplay: section cleanup in cfag12864bfb driver
This fixes a two section mismatches and makes remove() __devexit.
Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
Cc: Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/auxdisplay/cfag12864bfb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/auxdisplay/cfag12864bfb.c b/drivers/auxdisplay/cfag12864bfb.c index 3fecfb446d90..5ad3bad2b0a5 100644 --- a/drivers/auxdisplay/cfag12864bfb.c +++ b/drivers/auxdisplay/cfag12864bfb.c | |||
@@ -37,7 +37,7 @@ | |||
37 | 37 | ||
38 | #define CFAG12864BFB_NAME "cfag12864bfb" | 38 | #define CFAG12864BFB_NAME "cfag12864bfb" |
39 | 39 | ||
40 | static struct fb_fix_screeninfo cfag12864bfb_fix __initdata = { | 40 | static struct fb_fix_screeninfo cfag12864bfb_fix __devinitdata = { |
41 | .id = "cfag12864b", | 41 | .id = "cfag12864b", |
42 | .type = FB_TYPE_PACKED_PIXELS, | 42 | .type = FB_TYPE_PACKED_PIXELS, |
43 | .visual = FB_VISUAL_MONO10, | 43 | .visual = FB_VISUAL_MONO10, |
@@ -48,7 +48,7 @@ static struct fb_fix_screeninfo cfag12864bfb_fix __initdata = { | |||
48 | .accel = FB_ACCEL_NONE, | 48 | .accel = FB_ACCEL_NONE, |
49 | }; | 49 | }; |
50 | 50 | ||
51 | static struct fb_var_screeninfo cfag12864bfb_var __initdata = { | 51 | static struct fb_var_screeninfo cfag12864bfb_var __devinitdata = { |
52 | .xres = CFAG12864B_WIDTH, | 52 | .xres = CFAG12864B_WIDTH, |
53 | .yres = CFAG12864B_HEIGHT, | 53 | .yres = CFAG12864B_HEIGHT, |
54 | .xres_virtual = CFAG12864B_WIDTH, | 54 | .xres_virtual = CFAG12864B_WIDTH, |
@@ -114,7 +114,7 @@ none: | |||
114 | return ret; | 114 | return ret; |
115 | } | 115 | } |
116 | 116 | ||
117 | static int cfag12864bfb_remove(struct platform_device *device) | 117 | static int __devexit cfag12864bfb_remove(struct platform_device *device) |
118 | { | 118 | { |
119 | struct fb_info *info = platform_get_drvdata(device); | 119 | struct fb_info *info = platform_get_drvdata(device); |
120 | 120 | ||
@@ -128,7 +128,7 @@ static int cfag12864bfb_remove(struct platform_device *device) | |||
128 | 128 | ||
129 | static struct platform_driver cfag12864bfb_driver = { | 129 | static struct platform_driver cfag12864bfb_driver = { |
130 | .probe = cfag12864bfb_probe, | 130 | .probe = cfag12864bfb_probe, |
131 | .remove = cfag12864bfb_remove, | 131 | .remove = __devexit_p(cfag12864bfb_remove), |
132 | .driver = { | 132 | .driver = { |
133 | .name = CFAG12864BFB_NAME, | 133 | .name = CFAG12864BFB_NAME, |
134 | }, | 134 | }, |