aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan Mallon <ryan@bluewatersys.com>2011-01-10 14:49:27 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-01-11 07:26:58 -0500
commitc0fdcfa8e9a994176ff1070dced50eeff5f6f851 (patch)
tree7727413e57fd1bc7034e95738ca7d056baba1455
parent6426d2c2f071e0be50a22052a47b582f2561e5e0 (diff)
ARM: 6616/1: Fix ep93xx-fb init/exit annotations
Fix section mismatch errors in the ep93xx-fb driver resulting from incorrect init/exit annotations. Reported-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Ryan Mallon <ryan@bluewatersys.com> Tested-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--drivers/video/ep93xx-fb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/ep93xx-fb.c b/drivers/video/ep93xx-fb.c
index 0c99de0562ca..b358d045f130 100644
--- a/drivers/video/ep93xx-fb.c
+++ b/drivers/video/ep93xx-fb.c
@@ -483,7 +483,7 @@ static void ep93xxfb_dealloc_videomem(struct fb_info *info)
483 info->screen_base, info->fix.smem_start); 483 info->screen_base, info->fix.smem_start);
484} 484}
485 485
486static int __init ep93xxfb_probe(struct platform_device *pdev) 486static int __devinit ep93xxfb_probe(struct platform_device *pdev)
487{ 487{
488 struct ep93xxfb_mach_info *mach_info = pdev->dev.platform_data; 488 struct ep93xxfb_mach_info *mach_info = pdev->dev.platform_data;
489 struct fb_info *info; 489 struct fb_info *info;
@@ -598,7 +598,7 @@ failed:
598 return err; 598 return err;
599} 599}
600 600
601static int ep93xxfb_remove(struct platform_device *pdev) 601static int __devexit ep93xxfb_remove(struct platform_device *pdev)
602{ 602{
603 struct fb_info *info = platform_get_drvdata(pdev); 603 struct fb_info *info = platform_get_drvdata(pdev);
604 struct ep93xx_fbi *fbi = info->par; 604 struct ep93xx_fbi *fbi = info->par;
@@ -622,7 +622,7 @@ static int ep93xxfb_remove(struct platform_device *pdev)
622 622
623static struct platform_driver ep93xxfb_driver = { 623static struct platform_driver ep93xxfb_driver = {
624 .probe = ep93xxfb_probe, 624 .probe = ep93xxfb_probe,
625 .remove = ep93xxfb_remove, 625 .remove = __devexit_p(ep93xxfb_remove),
626 .driver = { 626 .driver = {
627 .name = "ep93xx-fb", 627 .name = "ep93xx-fb",
628 .owner = THIS_MODULE, 628 .owner = THIS_MODULE,