Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/video/platinumfb.c b/drivers/video/platinumfb.c
index 8a204e7a5b5b..72a1f4c04732 100644
--- a/drivers/video/platinumfb.c
+++ b/drivers/video/platinumfb.c
@@ -536,7 +536,7 @@ static int __init platinumfb_setup(char *options)
 static int __devinit platinumfb_probe(struct of_device* odev,
                                       const struct of_device_id *match)
 {
-        struct device_node      *dp = odev->node;
+        struct device_node      *dp = odev->dev.of_node;
         struct fb_info          *info;
         struct fb_info_platinum *pinfo;
         volatile __u8           *fbuffer;
@@ -679,8 +679,11 @@ static struct of_device_id platinumfb_match[] =
 
 static struct of_platform_driver platinum_driver = 
 {
-        .name           = "platinumfb",
-        .match_table    = platinumfb_match,
+        .driver = {
+                .name = "platinumfb",
+                .owner = THIS_MODULE,
+                .of_match_table = platinumfb_match,
+        },
         .probe          = platinumfb_probe,
         .remove         = platinumfb_remove,
 };