diff options
| author | Tilman Schmidt <tilman@imap.cc> | 2007-02-10 04:45:00 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 13:51:26 -0500 |
| commit | 4564f9e5fd00767d11fcf61e0d52787706dfcc87 (patch) | |
| tree | e7d2dd2c80099c23a7dadfb53f8faa74dba7d484 /include/asm-powerpc | |
| parent | 4a3b0a490d49ada8bbf3f426be1a0ace4dcd0a55 (diff) | |
[PATCH] consolidate line discipline number definitions
The line discipline numbers N_* are currently defined for each architecture
individually, but (except for a seeming mistake) identically, in
asm/termios.h. There is no obvious reason why these numbers should be
architecture specific, nor any apparent relationship with the termios
structure. The total number of these, NR_LDISCS, is defined in linux/tty.h
anyway. So I propose the following patch which moves the definitions of
the individual line disciplines to linux/tty.h too.
Three of these numbers (N_MASC, N_PROFIBUS_FDL, and N_SMSBLOCK) are unused
in the current kernel, but the patch still keeps the complete set in case
there are plans to use them yet.
Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-powerpc')
| -rw-r--r-- | include/asm-powerpc/termios.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/include/asm-powerpc/termios.h b/include/asm-powerpc/termios.h index 7f80a019b6a0..2c14fea07c8a 100644 --- a/include/asm-powerpc/termios.h +++ b/include/asm-powerpc/termios.h | |||
| @@ -71,24 +71,6 @@ struct termio { | |||
| 71 | #define _VEOL2 8 | 71 | #define _VEOL2 8 |
| 72 | #define _VSWTC 9 | 72 | #define _VSWTC 9 |
| 73 | 73 | ||
| 74 | /* line disciplines */ | ||
| 75 | #define N_TTY 0 | ||
| 76 | #define N_SLIP 1 | ||
| 77 | #define N_MOUSE 2 | ||
| 78 | #define N_PPP 3 | ||
| 79 | #define N_STRIP 4 | ||
| 80 | #define N_AX25 5 | ||
| 81 | #define N_X25 6 /* X.25 async */ | ||
| 82 | #define N_6PACK 7 | ||
| 83 | #define N_MASC 8 /* Reserved for Mobitex module <kaz@cafe.net> */ | ||
| 84 | #define N_R3964 9 /* Reserved for Simatic R3964 module */ | ||
| 85 | #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ | ||
| 86 | #define N_IRDA 11 /* Linux IrDa - http://www.cs.uit.no/~dagb/irda/irda.html */ | ||
| 87 | #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */ | ||
| 88 | #define N_HDLC 13 /* synchronous HDLC */ | ||
| 89 | #define N_SYNC_PPP 14 | ||
| 90 | #define N_HCI 15 /* Bluetooth HCI UART */ | ||
| 91 | |||
| 92 | #ifdef __KERNEL__ | 74 | #ifdef __KERNEL__ |
| 93 | /* ^C ^\ del ^U ^D 1 0 0 0 0 ^W ^R ^Z ^Q ^S ^V ^U */ | 75 | /* ^C ^\ del ^U ^D 1 0 0 0 0 ^W ^R ^Z ^Q ^S ^V ^U */ |
| 94 | #define INIT_C_CC "\003\034\177\025\004\001\000\000\000\000\027\022\032\021\023\026\025" | 76 | #define INIT_C_CC "\003\034\177\025\004\001\000\000\000\000\027\022\032\021\023\026\025" |