diff options
Diffstat (limited to 'drivers/serial/jsm')
-rw-r--r-- | drivers/serial/jsm/jsm_tty.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/serial/jsm/jsm_tty.c b/drivers/serial/jsm/jsm_tty.c index f8262e6ad8d..7cf1c60027f 100644 --- a/drivers/serial/jsm/jsm_tty.c +++ b/drivers/serial/jsm/jsm_tty.c | |||
@@ -142,7 +142,7 @@ static void jsm_tty_send_xchar(struct uart_port *port, char ch) | |||
142 | { | 142 | { |
143 | unsigned long lock_flags; | 143 | unsigned long lock_flags; |
144 | struct jsm_channel *channel = (struct jsm_channel *)port; | 144 | struct jsm_channel *channel = (struct jsm_channel *)port; |
145 | struct termios *termios; | 145 | struct ktermios *termios; |
146 | 146 | ||
147 | spin_lock_irqsave(&port->lock, lock_flags); | 147 | spin_lock_irqsave(&port->lock, lock_flags); |
148 | termios = port->info->tty->termios; | 148 | termios = port->info->tty->termios; |
@@ -180,7 +180,7 @@ static int jsm_tty_open(struct uart_port *port) | |||
180 | struct jsm_board *brd; | 180 | struct jsm_board *brd; |
181 | int rc = 0; | 181 | int rc = 0; |
182 | struct jsm_channel *channel = (struct jsm_channel *)port; | 182 | struct jsm_channel *channel = (struct jsm_channel *)port; |
183 | struct termios *termios; | 183 | struct ktermios *termios; |
184 | 184 | ||
185 | /* Get board pointer from our array of majors we have allocated */ | 185 | /* Get board pointer from our array of majors we have allocated */ |
186 | brd = channel->ch_bd; | 186 | brd = channel->ch_bd; |
@@ -269,7 +269,7 @@ static int jsm_tty_open(struct uart_port *port) | |||
269 | static void jsm_tty_close(struct uart_port *port) | 269 | static void jsm_tty_close(struct uart_port *port) |
270 | { | 270 | { |
271 | struct jsm_board *bd; | 271 | struct jsm_board *bd; |
272 | struct termios *ts; | 272 | struct ktermios *ts; |
273 | struct jsm_channel *channel = (struct jsm_channel *)port; | 273 | struct jsm_channel *channel = (struct jsm_channel *)port; |
274 | 274 | ||
275 | jsm_printk(CLOSE, INFO, &channel->ch_bd->pci_dev, "start\n"); | 275 | jsm_printk(CLOSE, INFO, &channel->ch_bd->pci_dev, "start\n"); |
@@ -302,8 +302,8 @@ static void jsm_tty_close(struct uart_port *port) | |||
302 | } | 302 | } |
303 | 303 | ||
304 | static void jsm_tty_set_termios(struct uart_port *port, | 304 | static void jsm_tty_set_termios(struct uart_port *port, |
305 | struct termios *termios, | 305 | struct ktermios *termios, |
306 | struct termios *old_termios) | 306 | struct ktermios *old_termios) |
307 | { | 307 | { |
308 | unsigned long lock_flags; | 308 | unsigned long lock_flags; |
309 | struct jsm_channel *channel = (struct jsm_channel *)port; | 309 | struct jsm_channel *channel = (struct jsm_channel *)port; |