diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-26 21:30:38 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-26 21:30:38 -0400 |
| commit | 835d39fcb56cba00b78c60634d6bb0f046ef601c (patch) | |
| tree | 235cecc646bada5c0b76836d42e44e7a5d93c0f8 /include | |
| parent | 89bad5892abca55f56d0ea713c7306d1f845ac8e (diff) | |
| parent | ecd68853b852cdafb138f9c437f3a751fe7dc381 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-alpha/termbits.h | 1 | ||||
| -rw-r--r-- | include/asm-powerpc/termbits.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-alpha/termbits.h b/include/asm-alpha/termbits.h index f4837fa29420..5541101b58ae 100644 --- a/include/asm-alpha/termbits.h +++ b/include/asm-alpha/termbits.h | |||
| @@ -148,6 +148,7 @@ struct termios { | |||
| 148 | #define HUPCL 00040000 | 148 | #define HUPCL 00040000 |
| 149 | 149 | ||
| 150 | #define CLOCAL 00100000 | 150 | #define CLOCAL 00100000 |
| 151 | #define CMSPAR 010000000000 /* mark or space (stick) parity */ | ||
| 151 | #define CRTSCTS 020000000000 /* flow control */ | 152 | #define CRTSCTS 020000000000 /* flow control */ |
| 152 | 153 | ||
| 153 | /* c_lflag bits */ | 154 | /* c_lflag bits */ |
diff --git a/include/asm-powerpc/termbits.h b/include/asm-powerpc/termbits.h index ebf6055481dc..6d533b07aaf5 100644 --- a/include/asm-powerpc/termbits.h +++ b/include/asm-powerpc/termbits.h | |||
| @@ -153,6 +153,7 @@ struct termios { | |||
| 153 | #define HUPCL 00040000 | 153 | #define HUPCL 00040000 |
| 154 | 154 | ||
| 155 | #define CLOCAL 00100000 | 155 | #define CLOCAL 00100000 |
| 156 | #define CMSPAR 010000000000 /* mark or space (stick) parity */ | ||
| 156 | #define CRTSCTS 020000000000 /* flow control */ | 157 | #define CRTSCTS 020000000000 /* flow control */ |
| 157 | 158 | ||
| 158 | /* c_lflag bits */ | 159 | /* c_lflag bits */ |