Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-drm-fsl-dcu.git] / include / linux / tty.h

diff --git a/include/linux/tty.h b/include/linux/tty.h
index 4409967db0c45e8e0a5568b5596e4b42bffe659c..bb44fa9ae135a030a9cc7173db61b3f48c4c392f 100644 (file)
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -23,7 +23,7 @@
  */
 #define NR_UNIX98_PTY_DEFAULT  4096      /* Default maximum for Unix98 ptys */
 #define NR_UNIX98_PTY_MAX      (1 << MINORBITS) /* Absolute limit */
-#define NR_LDISCS              20
+#define NR_LDISCS              21
 
 /* line disciplines */
 #define N_TTY          0
@@ -46,8 +46,8 @@
 #define N_GIGASET_M101 16      /* Siemens Gigaset M101 serial DECT adapter */
 #define N_SLCAN                17      /* Serial / USB serial CAN Adaptors */
 #define N_PPS          18      /* Pulse per Second */
-
 #define N_V253         19      /* Codec control over voice modem */
+#define N_CAIF         20      /* CAIF protocol for talking to modems */
 
 /*
  * This character is the same as _POSIX_VDISABLE: it cannot be used as