---

yaml --- r: 235546 b: refs/heads/master c: 10e82f6 h: refs/heads/master v: v3
git-mirror · Feb 22, 2011 · a2f380f · a2f380f
1 parent ff5b7dd
commit a2f380f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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) &&