diff options
| author | Luciano Coelho <coelho@ti.com> | 2011-12-01 12:14:48 +0200 |
|---|---|---|
| committer | Luciano Coelho <coelho@ti.com> | 2011-12-01 12:14:48 +0200 |
| commit | e4da3fbfbd1de56d2367653e3823e6445e49f8a9 (patch) | |
| tree | f69f424f731b89a75f881967903ff2f38f4b6a92 /include/linux/serial.h | |
| parent | b693289406f0b8ca70ab77e745be6196d5740eb0 (diff) | |
| parent | ba5736a5e9ac20c378ae4179e8a0ed3cc4b44351 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into wl12xx-next
Diffstat (limited to 'include/linux/serial.h')
| -rw-r--r-- | include/linux/serial.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/serial.h b/include/linux/serial.h index ef914061511e..97ff8e27a6cc 100644 --- a/include/linux/serial.h +++ b/include/linux/serial.h @@ -211,6 +211,7 @@ struct serial_rs485 { #define SER_RS485_RTS_ON_SEND (1 << 1) #define SER_RS485_RTS_AFTER_SEND (1 << 2) #define SER_RS485_RTS_BEFORE_SEND (1 << 3) +#define SER_RS485_RX_DURING_TX (1 << 4) __u32 delay_rts_before_send; /* Milliseconds */ __u32 delay_rts_after_send; /* Milliseconds */ __u32 padding[5]; /* Memory is cheap, new structs |