diff options
Diffstat (limited to 'drivers/serial/sunzilog.c')
-rw-r--r-- | drivers/serial/sunzilog.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c index 2c7a66af4f52..20f9be8cd949 100644 --- a/drivers/serial/sunzilog.c +++ b/drivers/serial/sunzilog.c | |||
@@ -1180,7 +1180,7 @@ static int __init sunzilog_console_setup(struct console *con, char *options) | |||
1180 | (sunzilog_reg.minor - 64) + con->index, con->index); | 1180 | (sunzilog_reg.minor - 64) + con->index, con->index); |
1181 | 1181 | ||
1182 | /* Get firmware console settings. */ | 1182 | /* Get firmware console settings. */ |
1183 | sunserial_console_termios(con, to_of_device(up->port.dev)->node); | 1183 | sunserial_console_termios(con, to_of_device(up->port.dev)->dev.of_node); |
1184 | 1184 | ||
1185 | /* Firmware console speed is limited to 150-->38400 baud so | 1185 | /* Firmware console speed is limited to 150-->38400 baud so |
1186 | * this hackish cflag thing is OK. | 1186 | * this hackish cflag thing is OK. |
@@ -1358,7 +1358,7 @@ static int __devinit zs_probe(struct of_device *op, const struct of_device_id *m | |||
1358 | int keyboard_mouse = 0; | 1358 | int keyboard_mouse = 0; |
1359 | int err; | 1359 | int err; |
1360 | 1360 | ||
1361 | if (of_find_property(op->node, "keyboard", NULL)) | 1361 | if (of_find_property(op->dev.of_node, "keyboard", NULL)) |
1362 | keyboard_mouse = 1; | 1362 | keyboard_mouse = 1; |
1363 | 1363 | ||
1364 | /* uarts must come before keyboards/mice */ | 1364 | /* uarts must come before keyboards/mice */ |
@@ -1415,7 +1415,7 @@ static int __devinit zs_probe(struct of_device *op, const struct of_device_id *m | |||
1415 | sunzilog_init_hw(&up[1]); | 1415 | sunzilog_init_hw(&up[1]); |
1416 | 1416 | ||
1417 | if (!keyboard_mouse) { | 1417 | if (!keyboard_mouse) { |
1418 | if (sunserial_console_match(SUNZILOG_CONSOLE(), op->node, | 1418 | if (sunserial_console_match(SUNZILOG_CONSOLE(), op->dev.of_node, |
1419 | &sunzilog_reg, up[0].port.line, | 1419 | &sunzilog_reg, up[0].port.line, |
1420 | false)) | 1420 | false)) |
1421 | up->flags |= SUNZILOG_FLAG_IS_CONS; | 1421 | up->flags |= SUNZILOG_FLAG_IS_CONS; |
@@ -1425,7 +1425,7 @@ static int __devinit zs_probe(struct of_device *op, const struct of_device_id *m | |||
1425 | rp, sizeof(struct zilog_layout)); | 1425 | rp, sizeof(struct zilog_layout)); |
1426 | return err; | 1426 | return err; |
1427 | } | 1427 | } |
1428 | if (sunserial_console_match(SUNZILOG_CONSOLE(), op->node, | 1428 | if (sunserial_console_match(SUNZILOG_CONSOLE(), op->dev.of_node, |
1429 | &sunzilog_reg, up[1].port.line, | 1429 | &sunzilog_reg, up[1].port.line, |
1430 | false)) | 1430 | false)) |
1431 | up->flags |= SUNZILOG_FLAG_IS_CONS; | 1431 | up->flags |= SUNZILOG_FLAG_IS_CONS; |