Merge 4.0-rc3 into tty-testing

This resolves a merge issue in drivers/tty/serial/8250/8250_pci.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 0 insertions, 19 deletions

diff --git a/include/uapi/linux/serial_reg.h b/include/uapi/linux/serial_reg.h
index 00adb01fa5f3..e9b4cb0cd7ed 100644
--- a/include/uapi/linux/serial_reg.h
+++ b/include/uapi/linux/serial_reg.h
@@ -242,25 +242,6 @@
 #define UART_FCR_PXAR32 0xc0    /* receive FIFO threshold = 32 */
 
 /*
- * Intel MID on-chip HSU (High Speed UART) defined bits
- */
-#define UART_FCR_HSU_64_1B      0x00    /* receive FIFO treshold = 1 */
-#define UART_FCR_HSU_64_16B     0x40    /* receive FIFO treshold = 16 */
-#define UART_FCR_HSU_64_32B     0x80    /* receive FIFO treshold = 32 */
-#define UART_FCR_HSU_64_56B     0xc0    /* receive FIFO treshold = 56 */
-
-#define UART_FCR_HSU_16_1B      0x00    /* receive FIFO treshold = 1 */
-#define UART_FCR_HSU_16_4B      0x40    /* receive FIFO treshold = 4 */
-#define UART_FCR_HSU_16_8B      0x80    /* receive FIFO treshold = 8 */
-#define UART_FCR_HSU_16_14B     0xc0    /* receive FIFO treshold = 14 */
-
-#define UART_FCR_HSU_64B_FIFO   0x20    /* chose 64 bytes FIFO */
-#define UART_FCR_HSU_16B_FIFO   0x00    /* chose 16 bytes FIFO */
-
-#define UART_FCR_HALF_EMPT_TXI  0x00    /* trigger TX_EMPT IRQ for half empty */
-#define UART_FCR_FULL_EMPT_TXI  0x08    /* trigger TX_EMPT IRQ for full empty */
-
-/*
  * These register definitions are for the 16C950
  */
 #define UART_ASR        0x01    /* Additional Status Register */