aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-05-26 21:30:38 -0400
committerJeff Garzik <jeff@garzik.org>2006-05-26 21:30:38 -0400
commit835d39fcb56cba00b78c60634d6bb0f046ef601c (patch)
tree235cecc646bada5c0b76836d42e44e7a5d93c0f8 /include
parent89bad5892abca55f56d0ea713c7306d1f845ac8e (diff)
parentecd68853b852cdafb138f9c437f3a751fe7dc381 (diff)
Merge branch 'master' into upstream
Diffstat (limited to 'include')
-rw-r--r--include/asm-alpha/termbits.h1
-rw-r--r--include/asm-powerpc/termbits.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-alpha/termbits.h b/include/asm-alpha/termbits.h
index f4837fa2942..5541101b58a 100644
--- a/include/asm-alpha/termbits.h
+++ b/include/asm-alpha/termbits.h
@@ -148,6 +148,7 @@ struct termios {
#define HUPCL 00040000
#define CLOCAL 00100000
+#define CMSPAR 010000000000 /* mark or space (stick) parity */
#define CRTSCTS 020000000000 /* flow control */
/* c_lflag bits */
diff --git a/include/asm-powerpc/termbits.h b/include/asm-powerpc/termbits.h
index ebf6055481d..6d533b07aaf 100644
--- a/include/asm-powerpc/termbits.h
+++ b/include/asm-powerpc/termbits.h
@@ -153,6 +153,7 @@ struct termios {
#define HUPCL 00040000
#define CLOCAL 00100000
+#define CMSPAR 010000000000 /* mark or space (stick) parity */
#define CRTSCTS 020000000000 /* flow control */
/* c_lflag bits */