Merge branch 'upstream-fixes' into upstream

2006-05-26 21:26:34 -04:00
parent d3f464b538 8fc29ba65b
commit cbc696a5fa
37 changed files with 220 additions and 179 deletions
@@ -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 */
@@ -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 */