compilation errors in drivers/serial/mpsc.c

PATCH New Lee Nicks 1 participant 2 messages Jun 20, 2005

lore

Share & tools

lore

Lee Nicks

author

2005-06-20 05:33 UTC #0 lore raw

PATCH 1/1 compilation errors in drivers/serial/mpsc.c

The following patch fix gcc 4 compilation errors in drivers/serial/mpsc.c

Signed-off-by Lee Nicks <[email protected]>

Index: linux-2.6.12/drivers/serial/mpsc.c
===================================================================
--- linux-2.6.12-orig/drivers/serial/mpsc.c 2005-06-17
12:48:29.000000000 -0700
+++ linux-2.6.12/drivers/serial/mpsc.c 2005-06-19 22:08:04.000000000 -0700 @@ -67,7 +67,11 @@

static struct mpsc_port_info mpsc_ports[MPSC_NUM_CTLRS]; static struct mpsc_shared_regs mpsc_shared_regs;
+static struct uart_driver mpsc_reg;

+static void mpsc_start_rx(struct mpsc_port_info *pi); +static void mpsc_free_ring_mem(struct mpsc_port_info *pi); +static void mpsc_release_port(struct uart_port *port);
/*
******************************************************************************
*
@@ -546,7 +550,6 @@
mpsc_alloc_ring_mem(struct mpsc_port_info *pi)

 {
        int rc = 0;

- static void mpsc_free_ring_mem(struct mpsc_port_info *pi);

pr_debug("mpsc_alloc_ring_mem[%d]: Allocating ring mem\n",
pi->port.line);
@@ -745,7 +748,6 @@

        int     rc = 0;
        u8      *bp;
        char    flag = TTY_NORMAL;

- static void mpsc_start_rx(struct mpsc_port_info *pi);

        pr_debug("mpsc_rx_intr[%d]: Handling Rx intr\n", pi->port.line);

@@ -1178,7 +1180,6 @@
mpsc_shutdown(struct uart_port *port)

 {
        struct mpsc_port_info *pi = (struct mpsc_port_info *)port;

- static void mpsc_release_port(struct uart_port *port);

        pr_debug("mpsc_shutdown[%d]: Shutting down MPSC\n", port->line);

@@ -1448,7 +1449,6 @@

        return uart_set_options(&pi->port, co, baud, parity, bits, flow);

}

-extern struct uart_driver mpsc_reg;
static struct console mpsc_console = {
.name = MPSC_DEV_NAME,
.write = mpsc_console_write,