Merge git://git.infradead.org/users/dwmw2/libraid-2.6 into for-linus

[~andy/linux] / drivers / video / ffb.c

diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c
index a42fabab69dfe5d43b96cd63902625b219845f46..f6ecfab296d39515f3639c3af2f618aa9a702f63 100644 (file)
--- a/drivers/video/ffb.c
+++ b/drivers/video/ffb.c
@@ -896,7 +896,7 @@ static void ffb_init_fix(struct fb_info *info)
 static int __devinit ffb_probe(struct of_device *op,
                               const struct of_device_id *match)
 {
-       struct device_node *dp = op->node;
+       struct device_node *dp = op->dev.of_node;
        struct ffb_fbc __iomem *fbc;
        struct ffb_dac __iomem *dac;
        struct fb_info *info;
@@ -1053,8 +1053,11 @@ static const struct of_device_id ffb_match[] = {
 MODULE_DEVICE_TABLE(of, ffb_match);
 
 static struct of_platform_driver ffb_driver = {
-       .name           = "ffb",
-       .match_table    = ffb_match,
+       .driver = {
+               .name = "ffb",
+               .owner = THIS_MODULE,
+               .of_match_table = ffb_match,
+       },
        .probe          = ffb_probe,
        .remove         = __devexit_p(ffb_remove),
 };
@@ -1064,12 +1067,12 @@ static int __init ffb_init(void)
        if (fb_get_options("ffb", NULL))
                return -ENODEV;
 
-       return of_register_driver(&ffb_driver, &of_bus_type);
+       return of_register_platform_driver(&ffb_driver);
 }
 
 static void __exit ffb_exit(void)
 {
-       of_unregister_driver(&ffb_driver);
+       of_unregister_platform_driver(&ffb_driver);
 }
 
 module_init(ffb_init);