Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / serial / 8250.c

diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index acea5623b2281159ee59003d82ac8e286489622c..4de99ffa0b7d2b7d822e23067feeed51383d37b5 100644 (file)
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -2856,6 +2856,8 @@ int __init early_serial_setup(struct uart_port *port)
        p->flags        = port->flags;
        p->mapbase      = port->mapbase;
        p->private_data = port->private_data;
+       p->type         = port->type;
+       p->line         = port->line;
 
        set_io_from_upio(p);
        if (port->serial_in)