|
@@ -47,7 +47,7 @@ static int ywrap = 0;
|
|
|
|
|
|
static int flatpanel_id = -1;
|
|
|
|
|
|
-static struct fb_fix_screeninfo sgivwfb_fix __initdata = {
|
|
|
+static struct fb_fix_screeninfo sgivwfb_fix __devinitdata = {
|
|
|
.id = "SGI Vis WS FB",
|
|
|
.type = FB_TYPE_PACKED_PIXELS,
|
|
|
.visual = FB_VISUAL_PSEUDOCOLOR,
|
|
@@ -57,7 +57,7 @@ static struct fb_fix_screeninfo sgivwfb_fix __initdata = {
|
|
|
.line_length = 640,
|
|
|
};
|
|
|
|
|
|
-static struct fb_var_screeninfo sgivwfb_var __initdata = {
|
|
|
+static struct fb_var_screeninfo sgivwfb_var __devinitdata = {
|
|
|
/* 640x480, 8 bpp */
|
|
|
.xres = 640,
|
|
|
.yres = 480,
|
|
@@ -79,7 +79,7 @@ static struct fb_var_screeninfo sgivwfb_var __initdata = {
|
|
|
.vmode = FB_VMODE_NONINTERLACED
|
|
|
};
|
|
|
|
|
|
-static struct fb_var_screeninfo sgivwfb_var1600sw __initdata = {
|
|
|
+static struct fb_var_screeninfo sgivwfb_var1600sw __devinitdata = {
|
|
|
/* 1600x1024, 8 bpp */
|
|
|
.xres = 1600,
|
|
|
.yres = 1024,
|
|
@@ -825,7 +825,7 @@ fail_ioremap_regs:
|
|
|
return -ENXIO;
|
|
|
}
|
|
|
|
|
|
-static int sgivwfb_remove(struct platform_device *dev)
|
|
|
+static int __devexit sgivwfb_remove(struct platform_device *dev)
|
|
|
{
|
|
|
struct fb_info *info = platform_get_drvdata(dev);
|
|
|
|
|
@@ -845,7 +845,7 @@ static int sgivwfb_remove(struct platform_device *dev)
|
|
|
|
|
|
static struct platform_driver sgivwfb_driver = {
|
|
|
.probe = sgivwfb_probe,
|
|
|
- .remove = sgivwfb_remove,
|
|
|
+ .remove = __devexit_p(sgivwfb_remove),
|
|
|
.driver = {
|
|
|
.name = "sgivwfb",
|
|
|
},
|