X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fserial%2F68328serial.h;h=58aa2154655b01385b14e63df1abf81a24d32b9d;hb=refs%2Fheads%2Fvserver;hp=d52a8e792c1be3f1b8bdcfa5bead9c8077e3325e;hpb=a6d8dea2993ef90fb69b81372daa0b63f8aa940e;p=linux-2.6.git

diff --git a/drivers/serial/68328serial.h b/drivers/serial/68328serial.h
index d52a8e792..58aa21546 100644
--- a/drivers/serial/68328serial.h
+++ b/drivers/serial/68328serial.h
@@ -11,7 +11,6 @@
 #ifndef _MC683XX_SERIAL_H
 #define _MC683XX_SERIAL_H
 
-#include <linux/config.h>
 
 struct serial_struct {
 	int	type;
@@ -22,11 +21,11 @@ struct serial_struct {
 	int	xmit_fifo_size;
 	int	custom_divisor;
 	int	baud_base;
-	unsigned int	close_delay;
+	unsigned short	close_delay;
 	char	reserved_char[2];
 	int	hub6;  /* FIXME: We don't have AT&T Hub6 boards! */
-	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... */
 	int	reserved[4];
 };
 
@@ -148,8 +147,8 @@ struct m68k_serial {
 	int			custom_divisor;
 	int			x_char;	/* xon/xoff character */
 	int			close_delay;
-	unsigned int		closing_wait;
-	unsigned int		closing_wait2;
+	unsigned short		closing_wait;
+	unsigned short		closing_wait2;
 	unsigned long		event;
 	unsigned long		last_active;
 	int			line;