Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[pandora-kernel.git] / drivers / tty / serial / atmel_serial.c

diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
index 358bbb2..9988c0c 100644 (file)
--- 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;