Commit 4d0145a7 authored by Lee Nicks's avatar Lee Nicks Committed by Linus Torvalds
Browse files

[PATCH] compilation errors in drivers/serial/mpsc.c



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

Signed-off-by: default avatarLee Nicks <allinux@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 66a464db
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -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 @@ 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);
@@ -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);

@@ -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);

@@ -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,