diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 18:03:52 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 18:03:52 -0800 |
| commit | b56566c61ebe66fc5c9aa33385ba5b13bf6a8957 (patch) | |
| tree | 098a056a41285753cbd8b993e292b82c55a2fc9a /include/linux/serial_reg.h | |
| parent | 44e8778cf19e61151a4819b771186c7e4c49bff1 (diff) | |
v2.4.2.2 -> v2.4.2.3
- Alan Cox: continued merging
- Urban Widmark: smbfs fix (d_add on already hashed dentry - no-no).
- Andrew Morton: 3c59x update
- Jeff Garzik: network driver cleanups and fixes
- Gérard Roudier: sym-ncr drivers update
- Jens Axboe: more loop cleanups and fixes
- David Miller: sparc update, some networking fixes
Diffstat (limited to 'include/linux/serial_reg.h')
| -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 09feb9501bd7..be42ec4fa99a 100644 --- a/include/linux/serial_reg.h +++ b/include/linux/serial_reg.h @@ -156,8 +156,8 @@ * These register definitions are for the 16C950 */ #define UART_ASR 0x01 /* Additional Status Register */ -#define UART_RFL 0x03 /* Transmitter FIFO level */ -#define UART_TFL 0x04 /* Receiver FIFO level */ +#define UART_RFL 0x03 /* Receiver FIFO level */ +#define UART_TFL 0x04 /* Transmitter FIFO level */ #define UART_ICR 0x05 /* Index Control Register */ /* The 16950 ICR registers */ |