From a794510a33a0f8b3c5a94d75380a3fbd7aa2afd7 Mon Sep 17 00:00:00 2001 From: Pavan Savoy Date: Thu, 30 Sep 2010 16:13:28 -0400 Subject: [PATCH] --- yaml --- r: 220085 b: refs/heads/master c: 40fb29a777d23b1161271ec88fd21739835e4f6a h: refs/heads/master i: 220083: 1db893046a55dcb8cb106db45c81e6f4159fbda6 v: v3 --- [refs] | 2 +- trunk/drivers/staging/ti-st/ti_wilink_st.h | 5 ----- trunk/include/linux/tty.h | 1 + 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 142de4467274..653e28d5bd5d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e24cce38a99f373450db67bf576fe73e8168d66 +refs/heads/master: 40fb29a777d23b1161271ec88fd21739835e4f6a diff --git a/trunk/drivers/staging/ti-st/ti_wilink_st.h b/trunk/drivers/staging/ti-st/ti_wilink_st.h index 537efce96d58..afb0cc644c1f 100644 --- a/trunk/drivers/staging/ti-st/ti_wilink_st.h +++ b/trunk/drivers/staging/ti-st/ti_wilink_st.h @@ -25,11 +25,6 @@ #ifndef TI_WILINK_ST_H #define TI_WILINK_ST_H -/* TODO: - * Move the following to tty.h upon acceptance - */ -#define N_TI_WL 22 /* Ldisc for TI's WL BT, FM, GPS combo chips */ - #ifdef __KERNEL__ /** * enum kim_gpio_state - Few protocols such as FM have ACTIVE LOW diff --git a/trunk/include/linux/tty.h b/trunk/include/linux/tty.h index 67d64e6efe7a..244bb8de2b92 100644 --- a/trunk/include/linux/tty.h +++ b/trunk/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