Merge branch 'upstream' into for-linus

[mirror_ubuntu-artful-kernel.git] / include / linux / serial_reg.h

diff --git a/include/linux/serial_reg.h b/include/linux/serial_reg.h
index c75bda37c18e1a1861040ed42d15086d7bf97d5e..8ce70d76f836e341ec06d711bec39dd97b110193 100644 (file)
--- a/include/linux/serial_reg.h
+++ b/include/linux/serial_reg.h
@@ -152,6 +152,7 @@
  * LCR=0xBF (or DLAB=1 for 16C660)
  */
 #define UART_EFR       2       /* I/O: Extended Features Register */
+#define UART_XR_EFR    9       /* I/O: Extended Features Register (XR17D15x) */
 #define UART_EFR_CTS           0x80 /* CTS flow control */
 #define UART_EFR_RTS           0x40 /* RTS flow control */
 #define UART_EFR_SCD           0x20 /* Special character detect */