diff options
| author | Henrik Kretzschmar <henne@nachtwindheim.de> | 2010-05-24 17:34:04 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-25 11:07:09 -0400 |
| commit | e88a0f461aeadfe309d36a2a4fac9ffb1b0ed651 (patch) | |
| tree | 7ba687702e6638737035eeb97e01e0c13283c413 | |
| parent | 49c39b4953e545ce3b5957cce22e1ade01c6e642 (diff) | |
hitfb: fix sections
Since the drivers probe call was changed from .init.text to .devinit.text
in commit c2e13037e6794bd0d9de3f9ecabf5615f15c160b ("platform-drivers:
move probe to .devinit.text in drivers/video") the fb_fix_screeninfo and
fb_var_screeninfo structures must be changed from .init.data to
.devinit.data, too.
Also the drivers remove routine should be moved from .exit.text to
.devexit.text
Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
Cc: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | drivers/video/hitfb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/hitfb.c b/drivers/video/hitfb.c index 393f3f3d3dfe..cfb8d6451014 100644 --- a/drivers/video/hitfb.c +++ b/drivers/video/hitfb.c | |||
| @@ -30,14 +30,14 @@ | |||
| 30 | 30 | ||
| 31 | #define WIDTH 640 | 31 | #define WIDTH 640 |
| 32 | 32 | ||
| 33 | static struct fb_var_screeninfo hitfb_var __initdata = { | 33 | static struct fb_var_screeninfo hitfb_var __devinitdata = { |
| 34 | .activate = FB_ACTIVATE_NOW, | 34 | .activate = FB_ACTIVATE_NOW, |
| 35 | .height = -1, | 35 | .height = -1, |
| 36 | .width = -1, | 36 | .width = -1, |
| 37 | .vmode = FB_VMODE_NONINTERLACED, | 37 | .vmode = FB_VMODE_NONINTERLACED, |
| 38 | }; | 38 | }; |
| 39 | 39 | ||
| 40 | static struct fb_fix_screeninfo hitfb_fix __initdata = { | 40 | static struct fb_fix_screeninfo hitfb_fix __devinitdata = { |
| 41 | .id = "Hitachi HD64461", | 41 | .id = "Hitachi HD64461", |
| 42 | .type = FB_TYPE_PACKED_PIXELS, | 42 | .type = FB_TYPE_PACKED_PIXELS, |
| 43 | .accel = FB_ACCEL_NONE, | 43 | .accel = FB_ACCEL_NONE, |
| @@ -417,7 +417,7 @@ err_fb: | |||
| 417 | return ret; | 417 | return ret; |
| 418 | } | 418 | } |
| 419 | 419 | ||
| 420 | static int __exit hitfb_remove(struct platform_device *dev) | 420 | static int __devexit hitfb_remove(struct platform_device *dev) |
| 421 | { | 421 | { |
| 422 | struct fb_info *info = platform_get_drvdata(dev); | 422 | struct fb_info *info = platform_get_drvdata(dev); |
| 423 | 423 | ||
| @@ -462,7 +462,7 @@ static const struct dev_pm_ops hitfb_dev_pm_ops = { | |||
| 462 | 462 | ||
| 463 | static struct platform_driver hitfb_driver = { | 463 | static struct platform_driver hitfb_driver = { |
| 464 | .probe = hitfb_probe, | 464 | .probe = hitfb_probe, |
| 465 | .remove = __exit_p(hitfb_remove), | 465 | .remove = __devexit_p(hitfb_remove), |
| 466 | .driver = { | 466 | .driver = { |
| 467 | .name = "hitfb", | 467 | .name = "hitfb", |
| 468 | .owner = THIS_MODULE, | 468 | .owner = THIS_MODULE, |
