Pull dock-bay into release branch

[linux-2.6] / include / asm-mips / termios.h

diff --git a/include/asm-mips/termios.h b/include/asm-mips/termios.h
index 4906204d34fe75edbf6dbfb8d71cf9a5fc000166..2ce07f4be369f3637de4e438fa3e274125feeff0 100644 (file)
--- a/include/asm-mips/termios.h
+++ b/include/asm-mips/termios.h
@@ -87,24 +87,6 @@ struct termio {
 #define TIOCM_OUT2     0x4000
 #define TIOCM_LOOP     0x8000
 
-/* line disciplines */
-#define N_TTY          0
-#define N_SLIP         1
-#define N_MOUSE                2
-#define N_PPP          3
-#define N_STRIP                4
-#define N_AX25         5
-#define N_X25          6               /* X.25 async */
-#define N_6PACK                7
-#define N_MASC         8       /* Reserved fo Mobitex module <kaz@cafe.net> */
-#define N_R3964                9       /* Reserved for Simatic R3964 module */
-#define N_PROFIBUS_FDL 10      /* Reserved for Profibus <Dave@mvhi.com> */
-#define N_IRDA         11      /* Linux IrDa - http://irda.sourceforge.net/ */
-#define N_SMSBLOCK     12      /* SMS block mode - for talking to GSM data cards about SMS messages */
-#define N_HDLC         13      /* synchronous HDLC */
-#define N_SYNC_PPP     14      /* synchronous PPP */
-#define N_HCI          15      /* Bluetooth HCI UART */
-
 #ifdef __KERNEL__
 
 #include <linux/string.h>