X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=drivers%2Fserial%2Fcrisv10.h;h=4a23340663aaaa10448d80a9865b8052057653bf;hb=692ec0c0222d74cc7e08e06df548d2818f57145a;hp=b6bbf4bad54638ad26ff62e441354802863e61b0;hpb=cace1c4618b6c6442b7dc973e935e7f3268e4aa7;p=linux-2.6.git

diff --git a/drivers/serial/crisv10.h b/drivers/serial/crisv10.h
index b6bbf4bad..4a2334066 100644
--- 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;