From d2d84099781c6eb37398ed3d12c5638c48935a63 Mon Sep 17 00:00:00 2001
From: Kumar Amit Mehta <gmate.amit@gmail.com>
Date: Fri, 23 Nov 2012 01:16:34 +0530
Subject: [PATCH] --- yaml --- r: 338471 b: refs/heads/master c:
 3ba89e96610b85b5a2f3a146f65342e38af27a79 h: refs/heads/master i:   338469:
 94a9aa6e4f7a31c2258f7657cf0734a7360b586f   338467:
 a8ee3774b09c11ec2f96581613fba4975392bd52   338463:
 ec869a4193e9f9f3e81d8b7b1980bb8eaf980d55 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/staging/dgrp/dgrp_tty.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index dc60e6c7c865..a5c2bda969b2 100644
--- 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
index e3fa6eac53ce..5796de8ddbe4 100644
--- 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));