summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTilman Schmidt <tilman@imap.cc>2008-02-02 16:14:53 +0800
committerBryan Wu <bryan.wu@analog.com>2008-02-02 16:14:53 +0800
commita8c12385c203ca7fa1cd5af25f910c41f6e4a2b5 (patch)
tree8997cdf5e7001dad4dc813c21f8efb736c257bb3
parentc0eab3b784ffdd3912450c7654c75bbcc0270ee8 (diff)
downloadop-kernel-dev-a8c12385c203ca7fa1cd5af25f910c41f6e4a2b5.zip
op-kernel-dev-a8c12385c203ca7fa1cd5af25f910c41f6e4a2b5.tar.gz
[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.h18
1 files changed, 0 insertions, 18 deletions
diff --git a/include/asm-blackfin/termios.h b/include/asm-blackfin/termios.h
index e31fe85..d50d063 100644
--- a/include/asm-blackfin/termios.h
+++ b/include/asm-blackfin/termios.h
@@ -39,24 +39,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 IR - 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__
/* intr=^C quit=^\ erase=del kill=^U
OpenPOWER on IntegriCloud