Messages in this thread Patch in this message | | | From | Nicolas Ferre <> | Subject | [PATCH] tty/serial: atmel_serial: fixup merge conflict | Date | Tue, 25 Oct 2011 12:05:29 +0200 |
| |
Proper atmel_console_init() merge using platform data.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> --- drivers/tty/serial/atmel_serial.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c index 358bbb2..9988c0c 100644 --- a/drivers/tty/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c @@ -1671,7 +1671,9 @@ static struct console atmel_console = { static int __init atmel_console_init(void) { if (atmel_default_console_device) { - int id = atmel_default_console_device->id; + struct atmel_uart_data *pdata = + atmel_default_console_device->dev.platform_data; + int id = pdata->num; struct atmel_uart_port *port = &atmel_ports[id]; port->backup_imr = 0; -- 1.7.5.4
| |