1 files changed, 8 insertions, 5 deletions

diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c
index d2e0321049e2..5e81bc6b48b0 100644
--- a/drivers/serial/sunsab.c
+++ b/drivers/serial/sunsab.c
@@ -883,7 +883,7 @@ static int sunsab_console_setup(struct console *con, char *options)
         printk("Console: ttyS%d (SAB82532)\n",
                (sunsab_reg.minor - 64) + con->index);
 
-        sunserial_console_termios(con, to_of_device(up->port.dev)->node);
+        sunserial_console_termios(con, to_of_device(up->port.dev)->dev.of_node);
 
         switch (con->cflag & CBAUD) {
         case B150: baud = 150; break;
@@ -1026,11 +1026,11 @@ static int __devinit sab_probe(struct of_device *op, const struct of_device_id *
         if (err)
                 goto out1;
 
-        sunserial_console_match(SUNSAB_CONSOLE(), op->node,
+        sunserial_console_match(SUNSAB_CONSOLE(), op->dev.of_node,
                                 &sunsab_reg, up[0].port.line,
                                 false);
 
-        sunserial_console_match(SUNSAB_CONSOLE(), op->node,
+        sunserial_console_match(SUNSAB_CONSOLE(), op->dev.of_node,
                                 &sunsab_reg, up[1].port.line,
                                 false);
 
@@ -1093,8 +1093,11 @@ static const struct of_device_id sab_match[] = {
 MODULE_DEVICE_TABLE(of, sab_match);
 
 static struct of_platform_driver sab_driver = {
-        .name           = "sab",
-        .match_table    = sab_match,
+        .driver = {
+                .name = "sab",
+                .owner = THIS_MODULE,
+                .of_match_table = sab_match,
+        },
         .probe          = sab_probe,
         .remove         = __devexit_p(sab_remove),
 };