Merge 'staging-next' to Linus's tree

[net-next-2.6.git] / include / linux / tty.h

diff --git a/include/linux/tty.h b/include/linux/tty.h
index 86be0cdeb11b088ddbf5e842592a9b15fb5262c5..e500171c745f2e574a2f199fcdd5c92931e2095f 100644 (file)
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -50,6 +50,7 @@
 #define N_V253         19      /* Codec control over voice modem */
 #define N_CAIF         20      /* CAIF protocol for talking to modems */
 #define N_GSM0710      21      /* GSM 0710 Mux */
+#define N_TI_WL        22      /* for TI's WL BT, FM, GPS combo chips */
 
 /*
  * This character is the same as _POSIX_VDISABLE: it cannot be used as