Merge branch 'linux-2.6'

[linux-drm-fsl-dcu.git] / drivers / serial / of_serial.c

diff --git a/drivers/serial/of_serial.c b/drivers/serial/of_serial.c
index e7928fee833a2f23ec00d9fd4f96da6a865ddd03..7ffdaeaf0545e2201803322a1b6959bd73feb3d8 100644 (file)
--- a/drivers/serial/of_serial.c
+++ b/drivers/serial/of_serial.c
@@ -48,7 +48,8 @@ static int __devinit of_platform_serial_setup(struct of_device *ofdev,
        port->iotype = UPIO_MEM;
        port->type = type;
        port->uartclk = *clk;
-       port->flags = UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF | UPF_IOREMAP;
+       port->flags = UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF | UPF_IOREMAP
+               | UPF_FIXED_PORT;
        port->dev = &ofdev->dev;
        port->custom_divisor = *clk / (16 * (*spd));