vserver 2.0-pre4

[linux-2.6.git] / include / linux / serial.h

diff --git a/include/linux/serial.h b/include/linux/serial.h
index 9a07d00..a1ef6a6 100644 (file)
--- a/include/linux/serial.h
+++ b/include/linux/serial.h
@@ -39,12 +39,12 @@ struct serial_struct {
        int     xmit_fifo_size;
        int     custom_divisor;
        int     baud_base;
-       unsigned short  close_delay;
+       unsigned int    close_delay;
        char    io_type;
        char    reserved_char[1];
        int     hub6;
-       unsigned short  closing_wait; /* time to wait before closing */
-       unsigned short  closing_wait2; /* no longer used... */
+       unsigned int    closing_wait; /* time to wait before closing */
+       unsigned int    closing_wait2; /* no longer used... */
        unsigned char   *iomem_base;
        unsigned short  iomem_reg_shift;
        unsigned int    port_high;
@@ -181,6 +181,8 @@ extern void unregister_serial(int line);
 /* Allow architectures to override entries in serial8250_ports[] at run time: */
 struct uart_port;      /* forward declaration */
 extern int early_serial_setup(struct uart_port *port);
+extern int early_serial_console_init(char *options);
+extern int serial8250_start_console(struct uart_port *port, char *options);
 
 #endif /* __KERNEL__ */
 #endif /* _LINUX_SERIAL_H */