diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 18:14:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 18:14:02 -0800 |
| commit | 236e6127ad942fa9712f83a2d441e0ba7c3fc190 (patch) | |
| tree | c57f86b605bcd3b1c08d28a8de945cca83e4152b /include/linux/serial_reg.h | |
| parent | 7216d3e927c3b6c5d28e5ffaa54afbb34649debb (diff) | |
v2.4.4 -> v2.4.4.1
- Al Viro: clean up driver "invalidate_device()" mess
- Andries Brouwer: make sd.c work with USB Dane-Elec CompactFlash Card
Reader
- me: fix nasty lazy kernel page table update problem
- me: undo fork changes. Too many user-level bugs and unresolved issues.
- Peter Anvin: iso9660 cleanups
- Alan Cox: big merge
- Johannes Erdfelt: UHCI pci DMA setup fix
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 be42ec4fa99a..947da230a189 100644 --- a/include/linux/serial_reg.h +++ b/include/linux/serial_reg.h @@ -260,8 +260,8 @@ #define UART_RSA_SRR_Rx_FIFO_NEMP (1 << 3) /* Rx FIFO is not empty (1) */ #define UART_RSA_SRR_Rx_FIFO_NHFL (1 << 4) /* Rx FIFO is not half full (1) */ #define UART_RSA_SRR_Rx_FIFO_NFUL (1 << 5) /* Rx FIFO is not full (1) */ -#define UART_RSA_SRR_Rx_TOUT (1 << 6) /* Character reception timeout occured (1) */ -#define UART_RSA_SRR_TIMER (1 << 7) /* Timer interrupt occured */ +#define UART_RSA_SRR_Rx_TOUT (1 << 6) /* Character reception timeout occurred (1) */ +#define UART_RSA_SRR_TIMER (1 << 7) /* Timer interrupt occurred */ #define UART_RSA_FRR ((UART_RSA_BASE) + 2) /* OUT: FIFO Reset Register */ |