X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=drivers%2Fvideo%2Fcg3.c;h=09c0c3c42482ba114e459de82dbe7d2ec8e591f0;hb=2dc11581376829303b98eadb2de253bee065a56a;hp=558d73a948a0d836c73ea20c26440229738ba581;hpb=7926e0bfbbc5ff81ddad0fda831eef7060e40997;p=deliverable%2Flinux.git

diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c
index 558d73a948a0..09c0c3c42482 100644
--- a/drivers/video/cg3.c
+++ b/drivers/video/cg3.c
@@ -346,7 +346,7 @@ static int __devinit cg3_do_default_mode(struct cg3_par *par)
 	return 0;
 }
 
-static int __devinit cg3_probe(struct of_device *op,
+static int __devinit cg3_probe(struct platform_device *op,
 			       const struct of_device_id *match)
 {
 	struct device_node *dp = op->dev.of_node;
@@ -433,7 +433,7 @@ out_err:
 	return err;
 }
 
-static int __devexit cg3_remove(struct of_device *op)
+static int __devexit cg3_remove(struct platform_device *op)
 {
 	struct fb_info *info = dev_get_drvdata(&op->dev);
 	struct cg3_par *par = info->par;
@@ -477,12 +477,12 @@ static int __init cg3_init(void)
 	if (fb_get_options("cg3fb", NULL))
 		return -ENODEV;
 
-	return of_register_driver(&cg3_driver, &of_bus_type);
+	return of_register_platform_driver(&cg3_driver);
 }
 
 static void __exit cg3_exit(void)
 {
-	of_unregister_driver(&cg3_driver);
+	of_unregister_platform_driver(&cg3_driver);
 }
 
 module_init(cg3_init);