git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
[pandora-kernel.git]
/
drivers
/
auxdisplay
/
cfag12864bfb.c
diff --git
a/drivers/auxdisplay/cfag12864bfb.c
b/drivers/auxdisplay/cfag12864bfb.c
index
3fecfb4
..
5ad3bad
100644
(file)
--- a/
drivers/auxdisplay/cfag12864bfb.c
+++ b/
drivers/auxdisplay/cfag12864bfb.c
@@
-37,7
+37,7
@@
#define CFAG12864BFB_NAME "cfag12864bfb"
#define CFAG12864BFB_NAME "cfag12864bfb"
-static struct fb_fix_screeninfo cfag12864bfb_fix __initdata = {
+static struct fb_fix_screeninfo cfag12864bfb_fix __
dev
initdata = {
.id = "cfag12864b",
.type = FB_TYPE_PACKED_PIXELS,
.visual = FB_VISUAL_MONO10,
.id = "cfag12864b",
.type = FB_TYPE_PACKED_PIXELS,
.visual = FB_VISUAL_MONO10,
@@
-48,7
+48,7
@@
static struct fb_fix_screeninfo cfag12864bfb_fix __initdata = {
.accel = FB_ACCEL_NONE,
};
.accel = FB_ACCEL_NONE,
};
-static struct fb_var_screeninfo cfag12864bfb_var __initdata = {
+static struct fb_var_screeninfo cfag12864bfb_var __
dev
initdata = {
.xres = CFAG12864B_WIDTH,
.yres = CFAG12864B_HEIGHT,
.xres_virtual = CFAG12864B_WIDTH,
.xres = CFAG12864B_WIDTH,
.yres = CFAG12864B_HEIGHT,
.xres_virtual = CFAG12864B_WIDTH,
@@
-114,7
+114,7
@@
none:
return ret;
}
return ret;
}
-static int cfag12864bfb_remove(struct platform_device *device)
+static int
__devexit
cfag12864bfb_remove(struct platform_device *device)
{
struct fb_info *info = platform_get_drvdata(device);
{
struct fb_info *info = platform_get_drvdata(device);
@@
-128,7
+128,7
@@
static int cfag12864bfb_remove(struct platform_device *device)
static struct platform_driver cfag12864bfb_driver = {
.probe = cfag12864bfb_probe,
static struct platform_driver cfag12864bfb_driver = {
.probe = cfag12864bfb_probe,
- .remove =
cfag12864bfb_remove
,
+ .remove =
__devexit_p(cfag12864bfb_remove)
,
.driver = {
.name = CFAG12864BFB_NAME,
},
.driver = {
.name = CFAG12864BFB_NAME,
},