Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 231285
b: refs/heads/master
c: c0fdcfa
h: refs/heads/master
i:
  231283: b3b6be9
v: v3
  • Loading branch information
Ryan Mallon authored and Russell King committed Jan 11, 2011
1 parent 89618a6 commit 2195f68
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6426d2c2f071e0be50a22052a47b582f2561e5e0
refs/heads/master: c0fdcfa8e9a994176ff1070dced50eeff5f6f851
6 changes: 3 additions & 3 deletions trunk/drivers/video/ep93xx-fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ static void ep93xxfb_dealloc_videomem(struct fb_info *info)
info->screen_base, info->fix.smem_start);
}

static int __init ep93xxfb_probe(struct platform_device *pdev)
static int __devinit ep93xxfb_probe(struct platform_device *pdev)
{
struct ep93xxfb_mach_info *mach_info = pdev->dev.platform_data;
struct fb_info *info;
Expand Down Expand Up @@ -598,7 +598,7 @@ static int __init ep93xxfb_probe(struct platform_device *pdev)
return err;
}

static int ep93xxfb_remove(struct platform_device *pdev)
static int __devexit ep93xxfb_remove(struct platform_device *pdev)
{
struct fb_info *info = platform_get_drvdata(pdev);
struct ep93xx_fbi *fbi = info->par;
Expand All @@ -622,7 +622,7 @@ static int ep93xxfb_remove(struct platform_device *pdev)

static struct platform_driver ep93xxfb_driver = {
.probe = ep93xxfb_probe,
.remove = ep93xxfb_remove,
.remove = __devexit_p(ep93xxfb_remove),
.driver = {
.name = "ep93xx-fb",
.owner = THIS_MODULE,
Expand Down

0 comments on commit 2195f68

Please sign in to comment.