diff options
Diffstat (limited to 'drivers/char/ip2')
-rw-r--r-- | drivers/char/ip2/ip2main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c index 6810b7bbcbb7..7c70310a49b5 100644 --- a/drivers/char/ip2/ip2main.c +++ b/drivers/char/ip2/ip2main.c | |||
@@ -177,7 +177,7 @@ static int ip2_write_room(PTTY); | |||
177 | static int ip2_chars_in_buf(PTTY); | 177 | static int ip2_chars_in_buf(PTTY); |
178 | static void ip2_flush_buffer(PTTY); | 178 | static void ip2_flush_buffer(PTTY); |
179 | static int ip2_ioctl(PTTY, struct file *, UINT, ULONG); | 179 | static int ip2_ioctl(PTTY, struct file *, UINT, ULONG); |
180 | static void ip2_set_termios(PTTY, struct termios *); | 180 | static void ip2_set_termios(PTTY, struct ktermios *); |
181 | static void ip2_set_line_discipline(PTTY); | 181 | static void ip2_set_line_discipline(PTTY); |
182 | static void ip2_throttle(PTTY); | 182 | static void ip2_throttle(PTTY); |
183 | static void ip2_unthrottle(PTTY); | 183 | static void ip2_unthrottle(PTTY); |
@@ -198,7 +198,7 @@ static void do_status(struct work_struct *); | |||
198 | 198 | ||
199 | static void ip2_wait_until_sent(PTTY,int); | 199 | static void ip2_wait_until_sent(PTTY,int); |
200 | 200 | ||
201 | static void set_params (i2ChanStrPtr, struct termios *); | 201 | static void set_params (i2ChanStrPtr, struct ktermios *); |
202 | static int get_serial_info(i2ChanStrPtr, struct serial_struct __user *); | 202 | static int get_serial_info(i2ChanStrPtr, struct serial_struct __user *); |
203 | static int set_serial_info(i2ChanStrPtr, struct serial_struct __user *); | 203 | static int set_serial_info(i2ChanStrPtr, struct serial_struct __user *); |
204 | 204 | ||
@@ -2398,7 +2398,7 @@ set_serial_info( i2ChanStrPtr pCh, struct serial_struct __user *new_info ) | |||
2398 | /* */ | 2398 | /* */ |
2399 | /******************************************************************************/ | 2399 | /******************************************************************************/ |
2400 | static void | 2400 | static void |
2401 | ip2_set_termios( PTTY tty, struct termios *old_termios ) | 2401 | ip2_set_termios( PTTY tty, struct ktermios *old_termios ) |
2402 | { | 2402 | { |
2403 | i2ChanStrPtr pCh = (i2ChanStrPtr)tty->driver_data; | 2403 | i2ChanStrPtr pCh = (i2ChanStrPtr)tty->driver_data; |
2404 | 2404 | ||
@@ -2440,11 +2440,11 @@ ip2_set_line_discipline ( PTTY tty ) | |||
2440 | /* change. */ | 2440 | /* change. */ |
2441 | /******************************************************************************/ | 2441 | /******************************************************************************/ |
2442 | static void | 2442 | static void |
2443 | set_params( i2ChanStrPtr pCh, struct termios *o_tios ) | 2443 | set_params( i2ChanStrPtr pCh, struct ktermios *o_tios ) |
2444 | { | 2444 | { |
2445 | tcflag_t cflag, iflag, lflag; | 2445 | tcflag_t cflag, iflag, lflag; |
2446 | char stop_char, start_char; | 2446 | char stop_char, start_char; |
2447 | struct termios dummy; | 2447 | struct ktermios dummy; |
2448 | 2448 | ||
2449 | lflag = pCh->pTTY->termios->c_lflag; | 2449 | lflag = pCh->pTTY->termios->c_lflag; |
2450 | cflag = pCh->pTTY->termios->c_cflag; | 2450 | cflag = pCh->pTTY->termios->c_cflag; |