Skip to content

Commit

Permalink
[PATCH] compilation errors in drivers/serial/mpsc.c
Browse files Browse the repository at this point in the history
The following patch fix gcc 4 compilation errors in drivers/serial/mpsc.c

Signed-off-by: Lee Nicks <allinux@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Lee Nicks authored and Linus Torvalds committed Jun 25, 2005
1 parent 66a464d commit 4d0145a
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/serial/mpsc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
/*
******************************************************************************
*
Expand Down Expand Up @@ -546,7 +550,6 @@ static int
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);
Expand Down Expand Up @@ -745,7 +748,6 @@ mpsc_rx_intr(struct mpsc_port_info *pi, struct pt_regs *regs)
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);

Expand Down Expand Up @@ -1178,7 +1180,6 @@ static void
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);

Expand Down Expand Up @@ -1448,7 +1449,6 @@ mpsc_console_setup(struct console *co, char *options)
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,
Expand Down

0 comments on commit 4d0145a

Please sign in to comment.