summaryrefslogtreecommitdiff
path: root/include/asm-mips/termbits.h
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-09-13 15:24:25 (GMT)
committerPaul Mackerras <paulus@samba.org>2007-09-13 15:24:25 (GMT)
commitb2315372eac9cd9f622c32a93e323cf6f0f03462 (patch)
tree9e1faa7cdcddf5d90bec4fb9523742d4cce699a1 /include/asm-mips/termbits.h
parent5326152fa182b0a16e4abf913ce403e3c7ab53b7 (diff)
parentc87ce65868bbf9bbea9c3f112ff8315302daf8f2 (diff)
downloadlinux-fsl-qoriq-b2315372eac9cd9f622c32a93e323cf6f0f03462.tar.xz
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'include/asm-mips/termbits.h')
-rw-r--r--include/asm-mips/termbits.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/asm-mips/termbits.h b/include/asm-mips/termbits.h
index 5bfdc3b..c83c684 100644
--- a/include/asm-mips/termbits.h
+++ b/include/asm-mips/termbits.h
@@ -164,6 +164,7 @@ struct ktermios {
#define HUPCL 0002000 /* Hang up on last close. */
#define CLOCAL 0004000 /* Ignore modem status lines. */
#define CBAUDEX 0010000
+#define BOTHER 0010000
#define B57600 0010001
#define B115200 0010002
#define B230400 0010003
@@ -179,9 +180,11 @@ struct ktermios {
#define B3000000 0010015
#define B3500000 0010016
#define B4000000 0010017
-#define CIBAUD 002003600000 /* input baud rate (not used) */
+#define CIBAUD 002003600000 /* input baud rate */
#define CMSPAR 010000000000 /* mark or space (stick) parity */
-#define CRTSCTS 020000000000 /* flow control */
+#define CRTSCTS 020000000000 /* flow control */
+
+#define IBSHIFT 16 /* Shift from CBAUD to CIBAUD */
/* c_lflag bits */
#define ISIG 0000001 /* Enable signals. */