fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / net / irda / ircomm_tty.h

diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
index faa66af..8dabdd6 100644 (file)
--- 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