From b86457a2593d849dfa205208a45d3ff31d40beb6 Mon Sep 17 00:00:00 2001 From: KOSAKI Motohiro Date: Thu, 26 May 2011 16:25:00 -0700 Subject: [PATCH] --- yaml --- r: 252011 b: refs/heads/master c: 1e806c50f4f36bb3aa9f6e43d9e4beb08a2d39d8 h: refs/heads/master i: 252009: 4dc5eee08502f297e8338e54913ef203a3b86c3c 252007: 2eb3f24940165a61785f46343caa0a037aaaeda9 v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/m32r_sio.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b415b8d9ba3b..6e16036c0560 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 937e26c0d1843c92750dac9bca1c972d33e73306 +refs/heads/master: 1e806c50f4f36bb3aa9f6e43d9e4beb08a2d39d8 diff --git a/trunk/drivers/tty/serial/m32r_sio.c b/trunk/drivers/tty/serial/m32r_sio.c index bea5c215460c..84db7321cce8 100644 --- a/trunk/drivers/tty/serial/m32r_sio.c +++ b/trunk/drivers/tty/serial/m32r_sio.c @@ -907,9 +907,10 @@ static int m32r_sio_request_port(struct uart_port *port) return ret; } -static void m32r_sio_config_port(struct uart_port *port, int flags) +static void m32r_sio_config_port(struct uart_port *port, int unused) { struct uart_sio_port *up = (struct uart_sio_port *)port; + unsigned long flags; spin_lock_irqsave(&up->port.lock, flags);