drm/nouveau: don't pretend to support the DVI-I 'select subconnector' prop

[mv-sheeva.git] / drivers / video / cg6.c

diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c
index 2b5a97058b085f1704bfc46d46ebfe3c4278c00e..179e96cdb323fa9e91f22f42be016f55a32993ea 100644 (file)
--- a/drivers/video/cg6.c
+++ b/drivers/video/cg6.c
@@ -737,8 +737,7 @@ static void cg6_unmap_regs(struct platform_device *op, struct fb_info *info,
                           info->fix.smem_len);
 }
 
-static int __devinit cg6_probe(struct platform_device *op,
-                               const struct of_device_id *match)
+static int __devinit cg6_probe(struct platform_device *op)
 {
        struct device_node *dp = op->dev.of_node;
        struct fb_info *info;
@@ -822,6 +821,7 @@ out_dealloc_cmap:
 
 out_unmap_regs:
        cg6_unmap_regs(op, info, par);
+       framebuffer_release(info);
 
 out_err:
        return err;
@@ -855,7 +855,7 @@ static const struct of_device_id cg6_match[] = {
 };
 MODULE_DEVICE_TABLE(of, cg6_match);
 
-static struct of_platform_driver cg6_driver = {
+static struct platform_driver cg6_driver = {
        .driver = {
                .name = "cg6",
                .owner = THIS_MODULE,
@@ -870,12 +870,12 @@ static int __init cg6_init(void)
        if (fb_get_options("cg6fb", NULL))
                return -ENODEV;
 
-       return of_register_platform_driver(&cg6_driver);
+       return platform_driver_register(&cg6_driver);
 }
 
 static void __exit cg6_exit(void)
 {
-       of_unregister_platform_driver(&cg6_driver);
+       platform_driver_unregister(&cg6_driver);
 }
 
 module_init(cg6_init);