This commit was manufactured by cvs2svn to create branch 'vserver'.

[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..1db2838 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;
@@ -1316,20 +1313,6 @@ void unregister_serial(int line)
        uart_unregister_port(&serial8250_reg, line);
 }
 
-/*
- * This is for ISAPNP only.
- */
-void serial8250_get_irq_map(unsigned int *map)
-{
-       int i;
-
-       for (i = 0; i < UART_NR; i++) {
-               if (serial8250_ports[i].port.type != PORT_UNKNOWN &&
-                   serial8250_ports[i].port.irq < 16)
-                       *map |= 1 << serial8250_ports[i].port.irq;
-       }
-}
-
 /**
  *     serial8250_suspend_port - suspend one serial port
  *     @line:  serial line number
@@ -1385,7 +1368,6 @@ module_exit(serial8250_exit);
 
 EXPORT_SYMBOL(register_serial);
 EXPORT_SYMBOL(unregister_serial);
-EXPORT_SYMBOL(serial8250_get_irq_map);
 EXPORT_SYMBOL(serial8250_suspend_port);
 EXPORT_SYMBOL(serial8250_resume_port);