Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 198336
b: refs/heads/master
c: bd9b5ca
h: refs/heads/master
v: v3
  • Loading branch information
Henrik Kretzschmar authored and Linus Torvalds committed May 25, 2010
1 parent c65c4f4 commit 1265684
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 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: dbd536bf2f1b494240b56035ee16eba2e3d89b6a
refs/heads/master: bd9b5caf8616501d2ab6f17210b11f81ea7546eb
8 changes: 4 additions & 4 deletions trunk/drivers/video/arcfb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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);

Expand All @@ -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",
},
Expand Down

0 comments on commit 1265684

Please sign in to comment.