Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[~andy/linux] / include / linux / serial.h

diff --git a/include/linux/serial.h b/include/linux/serial.h
index c8613c3ff9d30ba6fd4d818dfe0198c68e6b3609..1ebc694a6d521575165ad8443a472e0268e36dff 100644 (file)
--- a/include/linux/serial.h
+++ b/include/linux/serial.h
@@ -77,7 +77,8 @@ struct serial_struct {
 #define PORT_16654     11
 #define PORT_16850     12
 #define PORT_RSA       13      /* RSA-DV II/S card */
-#define PORT_MAX       13
+#define PORT_U6_16550A 14
+#define PORT_MAX       14
 
 #define SERIAL_IO_PORT 0
 #define SERIAL_IO_HUB6 1
@@ -151,7 +152,7 @@ struct serial_uart_config {
 #define ASYNC_BUGGY_UART       (1U << ASYNCB_BUGGY_UART)
 #define ASYNC_AUTOPROBE                (1U << ASYNCB_AUTOPROBE)
 
-#define ASYNC_FLAGS            ((1U << ASYNCB_LAST_USER) - 1)
+#define ASYNC_FLAGS            ((1U << (ASYNCB_LAST_USER + 1)) - 1)
 #define ASYNC_USR_MASK         (ASYNC_SPD_HI|ASYNC_SPD_VHI| \
                ASYNC_CALLOUT_NOHUP|ASYNC_SPD_SHI|ASYNC_LOW_LATENCY)
 #define ASYNC_SPD_CUST         (ASYNC_SPD_HI|ASYNC_SPD_VHI)
@@ -210,8 +211,10 @@ struct serial_rs485 {
 #define SER_RS485_ENABLED              (1 << 0)
 #define SER_RS485_RTS_ON_SEND          (1 << 1)
 #define SER_RS485_RTS_AFTER_SEND       (1 << 2)
+#define SER_RS485_RTS_BEFORE_SEND      (1 << 3)
        __u32   delay_rts_before_send;  /* Milliseconds */
-       __u32   padding[6];             /* Memory is cheap, new structs
+       __u32   delay_rts_after_send;   /* Milliseconds */
+       __u32   padding[5];             /* Memory is cheap, new structs
                                           are a royal PITA .. */
 };