---

yaml --- r: 338471 b: refs/heads/master c: 3ba89e9 h: refs/heads/master i: 338469: 94a9aa6 338467: a8ee377 338463: ec869a4 v: v3
git-mirror · Nov 27, 2012 · d2d8409 · d2d8409
1 parent 0971126
commit d2d8409
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72d4724ea54c360115bca7979167850dfa37ec65
+refs/heads/master: 3ba89e96610b85b5a2f3a146f65342e38af27a79
diff --git a/trunk/drivers/staging/dgrp/dgrp_tty.c b/trunk/drivers/staging/dgrp/dgrp_tty.c
@@ -2623,13 +2623,6 @@ static int dgrp_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
 		put_user(C_CLOCAL(tty) ? 1 : 0, (unsigned long __user *) arg);
 		return 0;
 
-	case TIOCSSOFTCAR:
-		get_user(arg, (unsigned long __user *) arg);
-		tty->termios.c_cflag =
-			((tty->termios.c_cflag & ~CLOCAL) |
-			 (arg ? CLOCAL : 0));
-		return 0;
-
 	case TIOCMGET:
 		rc = access_ok(VERIFY_WRITE, (void __user *) arg,
 				 sizeof(unsigned int));