VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / drivers / serial / au1x00_uart.c

diff --git a/drivers/serial/au1x00_uart.c b/drivers/serial/au1x00_uart.c
index 9b9eeb2..f1c524a 100644 (file)
--- a/drivers/serial/au1x00_uart.c
+++ b/drivers/serial/au1x00_uart.c
@@ -969,9 +969,7 @@ static int serial8250_request_port(struct uart_port *port)
        struct resource *res = NULL, *res_rsa = NULL;
        int ret = 0;
 
-       if (up->port.flags & UPF_RESOURCES) {
-               ret = serial8250_request_std_resource(up, &res);
-       }
+       ret = serial8250_request_std_resource(up, &res);
 
        /*
         * If we have a mapbase, then request that as well.
@@ -1072,8 +1070,7 @@ static void __init serial8250_isa_init_ports(void)
                up->port.iobase   = old_serial_port[i].port;
                up->port.irq      = old_serial_port[i].irq;
                up->port.uartclk  = get_au1x00_uart_baud_base();
-               up->port.flags    = old_serial_port[i].flags |
-                                   UPF_RESOURCES;
+               up->port.flags    = old_serial_port[i].flags;
                up->port.hub6     = old_serial_port[i].hub6;
                up->port.membase  = old_serial_port[i].iomem_base;
                up->port.iotype   = old_serial_port[i].io_type;