Merge branch 'master' of /repos/git/net-next-2.6

[pandora-kernel.git] / include / linux / serial_8250.h

diff --git a/include/linux/serial_8250.h b/include/linux/serial_8250.h
index 7638dea..97f5b45 100644 (file)
--- a/include/linux/serial_8250.h
+++ b/include/linux/serial_8250.h
@@ -35,6 +35,8 @@ struct plat_serial8250_port {
        void            (*set_termios)(struct uart_port *,
                                       struct ktermios *new,
                                       struct ktermios *old);
+       void            (*pm)(struct uart_port *, unsigned int state,
+                             unsigned old);
 };
 
 /*
@@ -76,5 +78,11 @@ extern int serial8250_find_port_for_earlycon(void);
 extern int setup_early_serial8250_console(char *cmdline);
 extern void serial8250_do_set_termios(struct uart_port *port,
                struct ktermios *termios, struct ktermios *old);
+extern void serial8250_do_pm(struct uart_port *port, unsigned int state,
+                            unsigned int oldstate);
+
+extern void serial8250_set_isa_configurator(void (*v)
+                                       (int port, struct uart_port *up,
+                                               unsigned short *capabilities));
 
 #endif