diff options
author | Tilman Schmidt <tilman@imap.cc> | 2008-02-02 03:14:53 -0500 |
---|---|---|
committer | Bryan Wu <bryan.wu@analog.com> | 2008-02-02 03:14:53 -0500 |
commit | a8c12385c203ca7fa1cd5af25f910c41f6e4a2b5 (patch) | |
tree | 8997cdf5e7001dad4dc813c21f8efb736c257bb3 | |
parent | c0eab3b784ffdd3912450c7654c75bbcc0270ee8 (diff) |
[Blackfin] arch: remove duplicated definitions of the line discipline numbers N_* in asm-blackfin/termios.h
The definitions of the line discipline numbers N_* have been moved
from asm-*/termios.h to linux/tty.h, but the Blackfin architecture
has somehow evaded that move. Bring it in line with the others.
Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>
-rw-r--r-- | include/asm-blackfin/termios.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/include/asm-blackfin/termios.h b/include/asm-blackfin/termios.h index e31fe859650b..d50d063c605a 100644 --- a/include/asm-blackfin/termios.h +++ b/include/asm-blackfin/termios.h | |||
@@ -39,24 +39,6 @@ struct termio { | |||
39 | 39 | ||
40 | /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ | 40 | /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ |
41 | 41 | ||
42 | /* line disciplines */ | ||
43 | #define N_TTY 0 | ||
44 | #define N_SLIP 1 | ||
45 | #define N_MOUSE 2 | ||
46 | #define N_PPP 3 | ||
47 | #define N_STRIP 4 | ||
48 | #define N_AX25 5 | ||
49 | #define N_X25 6 /* X.25 async */ | ||
50 | #define N_6PACK 7 | ||
51 | #define N_MASC 8 /* Reserved for Mobitex module <kaz@cafe.net> */ | ||
52 | #define N_R3964 9 /* Reserved for Simatic R3964 module */ | ||
53 | #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ | ||
54 | #define N_IRDA 11 /* Linux IR - http://irda.sourceforge.net/ */ | ||
55 | #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */ | ||
56 | #define N_HDLC 13 /* synchronous HDLC */ | ||
57 | #define N_SYNC_PPP 14 /* synchronous PPP */ | ||
58 | #define N_HCI 15 /* Bluetooth HCI UART */ | ||
59 | |||
60 | #ifdef __KERNEL__ | 42 | #ifdef __KERNEL__ |
61 | 43 | ||
62 | /* intr=^C quit=^\ erase=del kill=^U | 44 | /* intr=^C quit=^\ erase=del kill=^U |