From a2f380f11b221515abf3ee69fe4a05963ab6d6b5 Mon Sep 17 00:00:00 2001 From: "Luck, Tony" Date: Tue, 22 Feb 2011 11:47:04 -0800 Subject: [PATCH] --- yaml --- r: 235546 b: refs/heads/master c: 10e82f6ce76351425644bccc56f8e2c2ad596ce6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/ia64/hp/sim/simserial.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ee83e4d2def9..9dec06e87c6c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bdcffc5a1a28b566a38a4b0d5bcefc78a97f4ecb +refs/heads/master: 10e82f6ce76351425644bccc56f8e2c2ad596ce6 diff --git a/trunk/arch/ia64/hp/sim/simserial.c b/trunk/arch/ia64/hp/sim/simserial.c index 13633da0d3de..bff0824cf8a4 100644 --- a/trunk/arch/ia64/hp/sim/simserial.c +++ b/trunk/arch/ia64/hp/sim/simserial.c @@ -390,8 +390,7 @@ static void rs_unthrottle(struct tty_struct * tty) } -static int rs_ioctl(struct tty_struct *tty, struct file * file, - unsigned int cmd, unsigned long arg) +static int rs_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg) { if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) && (cmd != TIOCSERCONFIG) && (cmd != TIOCSERGSTRUCT) &&