diff options
| author | Jeff Garzik | 2006-05-27 03:30:38 +0200 |
|---|---|---|
| committer | Jeff Garzik | 2006-05-27 03:30:38 +0200 |
| commit | 835d39fcb56cba00b78c60634d6bb0f046ef601c (patch) | |
| tree | 235cecc646bada5c0b76836d42e44e7a5d93c0f8 /include | |
| parent | [PATCH] libata: add back ->data_xfer to ata_piix.c (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| download | kernel-qcow2-linux-835d39fcb56cba00b78c60634d6bb0f046ef601c.tar.gz kernel-qcow2-linux-835d39fcb56cba00b78c60634d6bb0f046ef601c.tar.xz kernel-qcow2-linux-835d39fcb56cba00b78c60634d6bb0f046ef601c.zip | |
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 { #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 ebf6055481dc..6d533b07aaf5 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 */ |