From 1ef41c00271f31190a37f046c912ef237b4f6360 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Wed, 30 Apr 2008 00:53:54 -0700 Subject: [PATCH] --- yaml --- r: 95211 b: refs/heads/master c: e5b393e4f1178faaf3d7c22ef63e70c79633bd66 h: refs/heads/master i: 95209: c06aa5c4e2de6b9e5e2299a23381e0d6d85915c2 95207: 3f8ef0408348f56b75b2e8dc72f9dacccb4bebb0 v: v3 --- [refs] | 2 +- trunk/drivers/char/istallion.c | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 8e42b5770ede..0ee1778ca5a4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cf1c63c3e68679dcac1cc6a37e619d9106ebc0ca +refs/heads/master: e5b393e4f1178faaf3d7c22ef63e70c79633bd66 diff --git a/trunk/drivers/char/istallion.c b/trunk/drivers/char/istallion.c index 37dc3d202c27..a1427d39d933 100644 --- a/trunk/drivers/char/istallion.c +++ b/trunk/drivers/char/istallion.c @@ -1682,16 +1682,6 @@ static int stli_ioctl(struct tty_struct *tty, struct file *file, unsigned int cm rc = 0; switch (cmd) { - case TIOCGSOFTCAR: - rc = put_user(((tty->termios->c_cflag & CLOCAL) ? 1 : 0), - (unsigned __user *) arg); - break; - case TIOCSSOFTCAR: - if ((rc = get_user(ival, (unsigned __user *) arg)) == 0) - tty->termios->c_cflag = - (tty->termios->c_cflag & ~CLOCAL) | - (ival ? CLOCAL : 0); - break; case TIOCGSERIAL: rc = stli_getserial(portp, argp); break;