Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1

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

diff --git a/drivers/serial/crisv10.h b/drivers/serial/crisv10.h
index b6bbf4b..4a23340 100644 (file)
--- a/drivers/serial/crisv10.h
+++ b/drivers/serial/crisv10.h
@@ -7,7 +7,6 @@
 #ifndef _ETRAX_SERIAL_H
 #define _ETRAX_SERIAL_H
 
-#include <linux/config.h>
 #include <linux/circ_buf.h>
 #include <asm/termios.h>
 
@@ -78,8 +77,8 @@ struct e100_serial {
        int                     ignore_status_mask;
        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;
@@ -94,8 +93,8 @@ struct e100_serial {
 
        struct work_struct      work;
        struct async_icount     icount;   /* error-statistics etc.*/
-       struct termios          normal_termios;
-       struct termios          callout_termios;
+       struct ktermios         normal_termios;
+       struct ktermios         callout_termios;
 #ifdef DECLARE_WAITQUEUE
        wait_queue_head_t       open_wait;
        wait_queue_head_t       close_wait;