Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6

[pandora-kernel.git] / drivers / video / sunxvr1000.c

diff --git a/drivers/video/sunxvr1000.c b/drivers/video/sunxvr1000.c
index 5dbe06a..b7f27ac 100644 (file)
--- a/drivers/video/sunxvr1000.c
+++ b/drivers/video/sunxvr1000.c
@@ -111,8 +111,7 @@ static int __devinit gfb_set_fbinfo(struct gfb_info *gp)
         return 0;
 }
 
-static int __devinit gfb_probe(struct platform_device *op,
-                              const struct of_device_id *match)
+static int __devinit gfb_probe(struct platform_device *op)
 {
        struct device_node *dp = op->dev.of_node;
        struct fb_info *info;
@@ -198,7 +197,7 @@ static const struct of_device_id gfb_match[] = {
 };
 MODULE_DEVICE_TABLE(of, ffb_match);
 
-static struct of_platform_driver gfb_driver = {
+static struct platform_driver gfb_driver = {
        .probe          = gfb_probe,
        .remove         = __devexit_p(gfb_remove),
        .driver = {
@@ -213,12 +212,12 @@ static int __init gfb_init(void)
        if (fb_get_options("gfb", NULL))
                return -ENODEV;
 
-       return of_register_platform_driver(&gfb_driver);
+       return platform_driver_register(&gfb_driver);
 }
 
 static void __exit gfb_exit(void)
 {
-       of_unregister_platform_driver(&gfb_driver);
+       platform_driver_unregister(&gfb_driver);
 }
 
 module_init(gfb_init);