fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / serial / mcfserial.h

diff --git a/drivers/serial/mcfserial.h b/drivers/serial/mcfserial.h
index dbd8eec..56420e2 100644 (file)
--- a/drivers/serial/mcfserial.h
+++ b/drivers/serial/mcfserial.h
@@ -14,7 +14,6 @@
 #ifndef _MCF_SERIAL_H
 #define _MCF_SERIAL_H
 
-#include <linux/config.h>
 #include <linux/serial.h>
 
 #ifdef __KERNEL__
@@ -52,8 +51,8 @@ struct mcf_serial {
        int                     x_char; /* xon/xoff character */
        int                     baud_base;
        int                     close_delay;
-       unsigned int            closing_wait;
-       unsigned int            closing_wait2;
+       unsigned short          closing_wait;
+       unsigned short          closing_wait2;
        unsigned long           event;
        int                     line;
        int                     count;      /* # of fd on device */