diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-13 06:57:21 +0100 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-13 06:57:21 +0100 |
commit | 54c66f6d781e03dc0b23956234963c4911e6d1c0 (patch) | |
tree | 40619a66ae6d8703a57bf681d087ffeabbffd346 /include/asm-m68k/termios.h | |
parent | [POWERPC] 85xx: Don't write reserved values to MAS1[TSIZE] (diff) | |
parent | [POWERPC] spufs: Fix bitrot of the SPU mmap facility (diff) | |
download | linux-54c66f6d781e03dc0b23956234963c4911e6d1c0.tar.xz linux-54c66f6d781e03dc0b23956234963c4911e6d1c0.zip |
Merge branch 'master' into 85xx
Diffstat (limited to 'include/asm-m68k/termios.h')
-rw-r--r-- | include/asm-m68k/termios.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/include/asm-m68k/termios.h b/include/asm-m68k/termios.h index 857f0c9a9120..00edabd76168 100644 --- a/include/asm-m68k/termios.h +++ b/include/asm-m68k/termios.h @@ -49,24 +49,6 @@ struct termio { /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ -/* 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 for 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 -#define N_HCI 15 /* Bluetooth HCI UART */ - #ifdef __KERNEL__ /* |