Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / video / q40fb.c

diff --git a/drivers/video/q40fb.c b/drivers/video/q40fb.c
index 71b69da..fc91dbf 100644 (file)
--- a/drivers/video/q40fb.c
+++ b/drivers/video/q40fb.c
@@ -18,10 +18,10 @@
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
+#include <linux/platform_device.h>
 
 #include <asm/uaccess.h>
 #include <asm/setup.h>
-#include <asm/segment.h>
 #include <asm/system.h>
 #include <asm/q40_master.h>
 #include <linux/fb.h>
@@ -84,12 +84,10 @@ static struct fb_ops q40fb_ops = {
        .fb_fillrect    = cfb_fillrect,
        .fb_copyarea    = cfb_copyarea,
        .fb_imageblit   = cfb_imageblit,
-       .fb_cursor      = soft_cursor,
 };
 
-static int __init q40fb_probe(struct device *device)
+static int __init q40fb_probe(struct platform_device *dev)
 {
-       struct platform_device *dev = to_platform_device(device);
        struct fb_info *info;
 
        if (!MACH_IS_Q40)
@@ -129,10 +127,11 @@ static int __init q40fb_probe(struct device *device)
        return 0;
 }
 
-static struct device_driver q40fb_driver = {
-       .name   = "q40fb",
-       .bus    = &platform_bus_type,
+static struct platform_driver q40fb_driver = {
        .probe  = q40fb_probe,
+       .driver = {
+               .name   = "q40fb",
+       },
 };
 
 static struct platform_device q40fb_device = {
@@ -146,12 +145,12 @@ int __init q40fb_init(void)
        if (fb_get_options("q40fb", NULL))
                return -ENODEV;
 
-       ret = driver_register(&q40fb_driver);
+       ret = platform_driver_register(&q40fb_driver);
 
        if (!ret) {
                ret = platform_device_register(&q40fb_device);
                if (ret)
-                       driver_unregister(&q40fb_driver);
+                       platform_driver_unregister(&q40fb_driver);
        }
        return ret;
 }