X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fserial.h;h=33fc8cb8ddfbaedf234300c397a87b50895e1ec7;hb=43bc926fffd92024b46cafaf7350d669ba9ca884;hp=a1ef6a64d9bcfeb9298dcc7ec91260f71251eacc;hpb=cee37fe97739d85991964371c1f3a745c00dd236;p=linux-2.6.git

diff --git a/include/linux/serial.h b/include/linux/serial.h
index a1ef6a64d..33fc8cb8d 100644
--- 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 */