---

yaml --- r: 220085 b: refs/heads/master c: 40fb29a h: refs/heads/master i: 220083: 1db8930 v: v3
git-mirror · Oct 5, 2010 · a794510 · a794510
1 parent 260e506
commit a794510
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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