From: Pavan Savoy Date: Thu, 30 Sep 2010 20:13:28 +0000 (-0400) Subject: tty.h: new ldisc for TI WiLink ST X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=40fb29a777d23b1161271ec88fd21739835e4f6a;p=linux-beck.git tty.h: new ldisc for TI WiLink ST Texas Instrument's WiLink7 connectivity devices pack wireless connectivity technologies like Bluetooth, FM Radio Receiver and Transmitter, GPS and WLAN into a single die. The BT, FM and GPS core on the chip are interfaced to application processors via a single UART. This line discipline driver allows such different technologies to be used simultaneous and independent of each other. Signed-off-by: Pavan Savoy Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/ti-st/ti_wilink_st.h b/drivers/staging/ti-st/ti_wilink_st.h index 537efce96d58..afb0cc644c1f 100644 --- a/drivers/staging/ti-st/ti_wilink_st.h +++ b/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/include/linux/tty.h b/include/linux/tty.h index 67d64e6efe7a..244bb8de2b92 100644 --- 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