Merge branch 'clk-fixes' into clk-next

[karo-tx-linux.git] / drivers / tty / serial / 8250 / 8250.h

diff --git a/drivers/tty/serial/8250/8250.h b/drivers/tty/serial/8250/8250.h
index c43f74c53cd98259056400cc86b9ff355c4993ca..d54dcd87c67e2948c3e39e772dbef0fc48378827 100644 (file)
--- a/drivers/tty/serial/8250/8250.h
+++ b/drivers/tty/serial/8250/8250.h
@@ -42,9 +42,9 @@ struct uart_8250_dma {
        size_t                  rx_size;
        size_t                  tx_size;
 
-       unsigned char           tx_running:1;
-       unsigned char           tx_err: 1;
-       unsigned char           rx_running:1;
+       unsigned char           tx_running;
+       unsigned char           tx_err;
+       unsigned char           rx_running;
 };
 
 struct old_serial_port {
@@ -211,3 +211,14 @@ static inline int ns16550a_goto_highspeed(struct uart_8250_port *up)
        }
        return 1;
 }
+
+static inline int serial_index(struct uart_port *port)
+{
+       return port->minor - 64;
+}
+
+#if 0
+#define DEBUG_INTR(fmt...)     printk(fmt)
+#else
+#define DEBUG_INTR(fmt...)     do { } while (0)
+#endif