Merge branches 'acpica-fixes', 'acpi-pci-fixes' and 'acpi-debug-fixes'

[deliverable/linux.git] / include / linux / serial_core.h

diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index cbfcf38e220def6070e3de57c56ce34f3536bd6c..a3d7c0d4a03e75016023184a5fea18c91d9d8dbc 100644 (file)
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -123,6 +123,7 @@ struct uart_port {
        void                    (*set_termios)(struct uart_port *,
                                               struct ktermios *new,
                                               struct ktermios *old);
+       unsigned int            (*get_mctrl)(struct uart_port *);
        void                    (*set_mctrl)(struct uart_port *, unsigned int);
        int                     (*startup)(struct uart_port *port);
        void                    (*shutdown)(struct uart_port *port);
@@ -281,6 +282,8 @@ struct uart_state {
        enum uart_pm_state      pm_state;
        struct circ_buf         xmit;
 
+       atomic_t                refcount;
+       wait_queue_head_t       remove_wait;
        struct uart_port        *uart_port;
 };