X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fnet%2Firda%2Fircomm_tty.h;h=8dabdd603fe158782de0adbcad9988df3eaed51b;hb=refs%2Fheads%2Fvserver;hp=faa66af84f902825fadc4040169c4a01a1ef3c22;hpb=a6d8dea2993ef90fb69b81372daa0b63f8aa940e;p=linux-2.6.git

diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
index faa66af84..8dabdd603 100644
--- a/include/net/irda/ircomm_tty.h
+++ b/include/net/irda/ircomm_tty.h
@@ -102,8 +102,8 @@ struct ircomm_tty_cb {
 	struct timer_list watchdog_timer;
 	struct work_struct  tqueue;
 
-	unsigned int      close_delay;
-	unsigned int      closing_wait; /* time to wait before closing */
+        unsigned short    close_delay;
+        unsigned short    closing_wait; /* time to wait before closing */
 
 	int  open_count;
 	int  blocked_open;	/* # of blocked opens */
@@ -126,7 +126,7 @@ extern int ircomm_tty_tiocmset(struct tty_struct *tty, struct file *file,
 extern int ircomm_tty_ioctl(struct tty_struct *tty, struct file *file, 
 			    unsigned int cmd, unsigned long arg);
 extern void ircomm_tty_set_termios(struct tty_struct *tty, 
-				   struct termios *old_termios);
+				   struct ktermios *old_termios);
 extern hashbin_t *ircomm_tty;
 
 #endif