Merge branch 'master' into for-linus

[mv-sheeva.git] / net / bluetooth / rfcomm / tty.c

diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
index 26461639f133499f1698488c162c7bd79831b8c0..a9b81f5dacd14c942d46e46c4bdcacc9f2070ac8 100644 (file)
--- a/net/bluetooth/rfcomm/tty.c
+++ b/net/bluetooth/rfcomm/tty.c
@@ -842,10 +842,6 @@ static int rfcomm_tty_ioctl(struct tty_struct *tty, struct file *filp, unsigned
                BT_DBG("TIOCMIWAIT");
                break;
 
-       case TIOCGICOUNT:
-               BT_DBG("TIOCGICOUNT");
-               break;
-
        case TIOCGSERIAL:
                BT_ERR("TIOCGSERIAL is not supported");
                return -ENOIOCTLCMD;