Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/include/linux/serial.h b/include/linux/serial.h
index a1ef6a6..33fc8cb 100644 (file)
--- a/include/linux/serial.h
+++ b/include/linux/serial.h
@@ -11,6 +11,7 @@
 #define _LINUX_SERIAL_H
 
 #ifdef __KERNEL__
+#include <linux/types.h>
 #include <asm/page.h>
 
 /*
@@ -39,12 +40,12 @@ struct serial_struct {
        int     xmit_fifo_size;
        int     custom_divisor;
        int     baud_base;
-       unsigned int    close_delay;
+       unsigned short  close_delay;
        char    io_type;
        char    reserved_char[1];
        int     hub6;
-       unsigned int    closing_wait; /* time to wait before closing */
-       unsigned int    closing_wait2; /* no longer used... */
+       unsigned short  closing_wait; /* time to wait before closing */
+       unsigned short  closing_wait2; /* no longer used... */
        unsigned char   *iomem_base;
        unsigned short  iomem_reg_shift;
        unsigned int    port_high;
@@ -174,9 +175,7 @@ struct serial_icounter_struct {
 
 
 #ifdef __KERNEL__
-/* Export to allow PCMCIA to use this - Dave Hinds */
-extern int register_serial(struct serial_struct *req);
-extern void unregister_serial(int line);
+#include <linux/compiler.h>
 
 /* Allow architectures to override entries in serial8250_ports[] at run time: */
 struct uart_port;      /* forward declaration */