4 files changed, 10 insertions, 10 deletions

diff --git a/include/linux/generic_serial.h b/include/linux/generic_serial.h
index e25384561955..5412da28fa47 100644
--- a/include/linux/generic_serial.h
+++ b/include/linux/generic_serial.h
@@ -91,7 +91,7 @@ void gs_hangup(struct tty_struct *tty);
 int  gs_block_til_ready(void *port, struct file *filp);
 void gs_close(struct tty_struct *tty, struct file *filp);
 void gs_set_termios (struct tty_struct * tty, 
-                     struct termios * old_termios);
+                     struct ktermios * old_termios);
 int  gs_init_port(struct gs_port *port);
 int  gs_setserial(struct gs_port *port, struct serial_struct __user *sp);
 int  gs_getserial(struct gs_port *port, struct serial_struct __user *sp);
diff --git a/include/linux/isdn.h b/include/linux/isdn.h
index 62991148d5a5..3c7875b7ab5b 100644
--- a/include/linux/isdn.h
+++ b/include/linux/isdn.h
@@ -511,8 +511,8 @@ typedef struct modem_info {
 #endif
   struct tty_struct     *tty;            /* Pointer to corresponding tty   */
   atemu                 emu;             /* AT-emulator data               */
-  struct termios        normal_termios;  /* For saving termios structs     */
-  struct termios        callout_termios;
+  struct ktermios       normal_termios;  /* For saving termios structs     */
+  struct ktermios       callout_termios;
   wait_queue_head_t     open_wait, close_wait;
   struct semaphore      write_sem;
   spinlock_t            readlock;
@@ -525,8 +525,8 @@ typedef struct _isdn_modem {
   int                refcount;                          /* Number of opens        */
   struct tty_driver  *tty_modem;                        /* tty-device             */
   struct tty_struct  *modem_table[ISDN_MAX_CHANNELS];   /* ?? copied from Orig    */
-  struct termios     *modem_termios[ISDN_MAX_CHANNELS];
-  struct termios     *modem_termios_locked[ISDN_MAX_CHANNELS];
+  struct ktermios     *modem_termios[ISDN_MAX_CHANNELS];
+  struct ktermios     *modem_termios_locked[ISDN_MAX_CHANNELS];
   modem_info         info[ISDN_MAX_CHANNELS];      /* Private data           */
 } isdn_modem_t;
 
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 827672136646..cf23813cbec2 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -166,8 +166,8 @@ struct uart_ops {
         void            (*break_ctl)(struct uart_port *, int ctl);
         int             (*startup)(struct uart_port *);
         void            (*shutdown)(struct uart_port *);
-        void            (*set_termios)(struct uart_port *, struct termios *new,
-                                       struct termios *old);
+        void            (*set_termios)(struct uart_port *, struct ktermios *new,
+                                       struct ktermios *old);
         void            (*pm)(struct uart_port *, unsigned int state,
                               unsigned int oldstate);
         int             (*set_wake)(struct uart_port *, unsigned int state);
@@ -361,8 +361,8 @@ void uart_write_wakeup(struct uart_port *port);
  */
 void uart_update_timeout(struct uart_port *port, unsigned int cflag,
                          unsigned int baud);
-unsigned int uart_get_baud_rate(struct uart_port *port, struct termios *termios,
-                                struct termios *old, unsigned int min,
+unsigned int uart_get_baud_rate(struct uart_port *port, struct ktermios *termios,
+                                struct ktermios *old, unsigned int min,
                                 unsigned int max);
 unsigned int uart_get_divisor(struct uart_port *port, unsigned int baud);
 
diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h
index 91b3ea2bbb14..10f99e5f1a97 100644
--- a/include/linux/usb/serial.h
+++ b/include/linux/usb/serial.h
@@ -218,7 +218,7 @@ struct usb_serial_driver {
         int  (*write)           (struct usb_serial_port *port, const unsigned char *buf, int count);
         int  (*write_room)      (struct usb_serial_port *port);
         int  (*ioctl)           (struct usb_serial_port *port, struct file * file, unsigned int cmd, unsigned long arg);
-        void (*set_termios)     (struct usb_serial_port *port, struct termios * old);
+        void (*set_termios)     (struct usb_serial_port *port, struct ktermios * old);
         void (*break_ctl)       (struct usb_serial_port *port, int break_state);
         int  (*chars_in_buffer) (struct usb_serial_port *port);
         void (*throttle)        (struct usb_serial_port *port);