1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/watchdog/cpwd.c b/drivers/watchdog/cpwd.c
index ba2efce4b40e..d62b9ce8f773 100644
--- a/drivers/watchdog/cpwd.c
+++ b/drivers/watchdog/cpwd.c
@@ -577,7 +577,7 @@ static int __devinit cpwd_probe(struct of_device *op,
          * interrupt_mask register cannot be written, so no timer
          * interrupts can be masked within the PLD.
          */
-        str_prop = of_get_property(op->node, "model", NULL);
+        str_prop = of_get_property(op->dev.of_node, "model", NULL);
         p->broken = (str_prop && !strcmp(str_prop, WD_BADMODEL));
 
         if (!p->enabled)
@@ -677,8 +677,11 @@ static const struct of_device_id cpwd_match[] = {
 MODULE_DEVICE_TABLE(of, cpwd_match);
 
 static struct of_platform_driver cpwd_driver = {
-        .name           = DRIVER_NAME,
-        .match_table    = cpwd_match,
+        .driver = {
+                .name = DRIVER_NAME,
+                .owner = THIS_MODULE,
+                .of_match_table = cpwd_match,
+        },
         .probe          = cpwd_probe,
         .remove         = __devexit_p(cpwd_remove),
 };