diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-24 19:01:07 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-24 19:01:07 -0500 |
| commit | 5c1ca65c93503b2c94359ba39640f9687bd192a3 (patch) | |
| tree | 74dfbe4da8d39e302ae343379e20585ffee4b940 /include | |
| parent | c946160e601c70a0ae0aa807461dd0232bcaf3a7 (diff) | |
| parent | d856c66618f953fc3cd1e613226d5f098ad322c8 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/serial_reg.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/serial_reg.h b/include/linux/serial_reg.h index 6a2bb955844b..3c8a6aa77415 100644 --- a/include/linux/serial_reg.h +++ b/include/linux/serial_reg.h | |||
| @@ -247,10 +247,10 @@ | |||
| 247 | #define UART_CTR 0xFF | 247 | #define UART_CTR 0xFF |
| 248 | 248 | ||
| 249 | /* | 249 | /* |
| 250 | * The 16C950 Additional Control Reigster | 250 | * The 16C950 Additional Control Register |
| 251 | */ | 251 | */ |
| 252 | #define UART_ACR_RXDIS 0x01 /* Receiver disable */ | 252 | #define UART_ACR_RXDIS 0x01 /* Receiver disable */ |
| 253 | #define UART_ACR_TXDIS 0x02 /* Receiver disable */ | 253 | #define UART_ACR_TXDIS 0x02 /* Transmitter disable */ |
| 254 | #define UART_ACR_DSRFC 0x04 /* DSR Flow Control */ | 254 | #define UART_ACR_DSRFC 0x04 /* DSR Flow Control */ |
| 255 | #define UART_ACR_TLENB 0x20 /* 950 trigger levels enable */ | 255 | #define UART_ACR_TLENB 0x20 /* 950 trigger levels enable */ |
| 256 | #define UART_ACR_ICRRD 0x40 /* ICR Read enable */ | 256 | #define UART_ACR_ICRRD 0x40 /* ICR Read enable */ |