Merge tag 'tty-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[~andy/linux] / drivers / staging / dgrp / dgrp_tty.c

diff --git a/drivers/staging/dgrp/dgrp_tty.c b/drivers/staging/dgrp/dgrp_tty.c
index 5647068b93858d029127662687af4435dcce571f..51d3ed3dca277e2d0cb1cf5d63a19711d996d6a2 100644 (file)
--- a/drivers/staging/dgrp/dgrp_tty.c
+++ b/drivers/staging/dgrp/dgrp_tty.c
@@ -2614,10 +2614,6 @@ static int dgrp_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
                 */
                return 0;
 
-       case TIOCGSOFTCAR:
-               return put_user(C_CLOCAL(tty) ? 1 : 0,
-                               (unsigned long __user *) arg);
-
        case TIOCMGET:
                rc = access_ok(VERIFY_WRITE, (void __user *) arg,
                                 sizeof(unsigned int));