From d082b8a6c8b2ed04c56148fab9ba5c1541f0f0cc Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 4 Jun 2008 10:35:03 -0700
Subject: [PATCH] --- yaml --- r: 97626 b: refs/heads/master c:
 edeb280e49d38a5330db25463ef45f5466b0058a h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/serial/serial_core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f3b3554c39ee..6c3376c8f790 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d389c7d8988aecfdc06d9e9f9769af09e6592082
+refs/heads/master: edeb280e49d38a5330db25463ef45f5466b0058a
diff --git a/trunk/drivers/serial/serial_core.c b/trunk/drivers/serial/serial_core.c
index 951a75ea6e3e..c9b64e73c987 100644
--- a/trunk/drivers/serial/serial_core.c
+++ b/trunk/drivers/serial/serial_core.c
@@ -1165,7 +1165,7 @@ uart_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd,
 	return ret;
 }
 
-static void uart_set_ldisc(struct tty_struct *tty, int ldisc)
+static void uart_set_ldisc(struct tty_struct *tty)
 {
 	struct uart_state *state = tty->driver_data;
 	struct uart_port *port = state->port;