1 files changed, 5 insertions, 5 deletions

diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index a5c31146a337..eadf33d0abba 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -46,7 +46,8 @@
 #define PORT_AR7        18      /* Texas Instruments AR7 internal UART */
 #define PORT_U6_16550A  19      /* ST-Ericsson U6xxx internal UART */
 #define PORT_TEGRA      20      /* NVIDIA Tegra internal UART */
-#define PORT_MAX_8250   20      /* max port ID */
+#define PORT_XR17D15X   21      /* Exar XR17D15x UART */
+#define PORT_MAX_8250   21      /* max port ID */
 
 /*
  * ARM specific type numbers.  These are not currently guaranteed
@@ -300,6 +301,7 @@ struct uart_port {
         void                    (*set_termios)(struct uart_port *,
                                                struct ktermios *new,
                                                struct ktermios *old);
+        int                     (*handle_irq)(struct uart_port *);
         void                    (*pm)(struct uart_port *, unsigned int state,
                                       unsigned int old);
         unsigned int            irq;                    /* irq number */
@@ -317,9 +319,7 @@ struct uart_port {
 #define UPIO_MEM32              (3)
 #define UPIO_AU                 (4)                     /* Au1x00 type IO */
 #define UPIO_TSI                (5)                     /* Tsi108/109 type IO */
-#define UPIO_DWAPB              (6)                     /* DesignWare APB UART */
-#define UPIO_RM9000             (7)                     /* RM9000 type IO */
-#define UPIO_DWAPB32            (8)                     /* DesignWare APB UART (32 bit accesses) */
+#define UPIO_RM9000             (6)                     /* RM9000 type IO */
 
         unsigned int            read_status_mask;       /* driver specific */
         unsigned int            ignore_status_mask;     /* driver specific */
@@ -350,6 +350,7 @@ struct uart_port {
 #define UPF_MAGIC_MULTIPLIER    ((__force upf_t) (1 << 16))
 #define UPF_CONS_FLOW           ((__force upf_t) (1 << 23))
 #define UPF_SHARE_IRQ           ((__force upf_t) (1 << 24))
+#define UPF_EXAR_EFR            ((__force upf_t) (1 << 25))
 /* The exact UART type is known and should not be probed.  */
 #define UPF_FIXED_TYPE          ((__force upf_t) (1 << 27))
 #define UPF_BOOT_AUTOCONF       ((__force upf_t) (1 << 28))
@@ -384,7 +385,6 @@ struct uart_state {
         int                     pm_state;
         struct circ_buf         xmit;
 
-        struct tasklet_struct   tlet;
         struct uart_port        *uart_port;
 };