From 1cc00e0753a2bbd53e43bf8c043724005f32e97f Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Wed, 14 Nov 2012 09:13:54 -0500
Subject: [PATCH] --- yaml --- r: 337949 b: refs/heads/master c:
 8fdefcb0ab74eff3273a6c3039c4e80ef5f56bdc h: refs/heads/master i:   337947:
 c8fdb45d3fbba36708a3b5ce294fb24bda8d909b v: v3

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

diff --git a/[refs] b/[refs]
index 493b6047b17d..2854adcaca61 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 581a7ddec13d8f08b308c4764090bf57b0254f6f
+refs/heads/master: 8fdefcb0ab74eff3273a6c3039c4e80ef5f56bdc
diff --git a/trunk/drivers/staging/dgrp/dgrp_tty.c b/trunk/drivers/staging/dgrp/dgrp_tty.c
index e125b03598d7..efa62ced7c8a 100644
--- a/trunk/drivers/staging/dgrp/dgrp_tty.c
+++ b/trunk/drivers/staging/dgrp/dgrp_tty.c
@@ -2615,21 +2615,6 @@ static int dgrp_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
 		 */
 		return 0;
 
-	case TIOCGSOFTCAR:
-		rc = access_ok(VERIFY_WRITE, (void __user *) arg,
-			       sizeof(long));
-		if (rc == 0)
-			return -EFAULT;
-		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));