diff options
author | Alan Cox <alan@linux.intel.com> | 2009-09-19 16:13:28 -0400 |
---|---|---|
committer | Live-CD User <linux@linux.site> | 2009-09-19 16:13:28 -0400 |
commit | ebd2c8f6d2ec4012c267ecb95e72a57b8355a705 (patch) | |
tree | 36a01b2ac2520bf7e0d9362b8da17d3c894da2db /drivers/serial/mpc52xx_uart.c | |
parent | 11d85d7b2ecc72fe752bba55389e7d11907528af (diff) |
serial: kill off uart_info
We moved this into uart_state, now move the fields out of the separate
structure and kill it off.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/serial/mpc52xx_uart.c')
-rw-r--r-- | drivers/serial/mpc52xx_uart.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c index abbd146c50d9..d7bcd074d383 100644 --- a/drivers/serial/mpc52xx_uart.c +++ b/drivers/serial/mpc52xx_uart.c | |||
@@ -745,7 +745,7 @@ static struct uart_ops mpc52xx_uart_ops = { | |||
745 | static inline int | 745 | static inline int |
746 | mpc52xx_uart_int_rx_chars(struct uart_port *port) | 746 | mpc52xx_uart_int_rx_chars(struct uart_port *port) |
747 | { | 747 | { |
748 | struct tty_struct *tty = port->info->port.tty; | 748 | struct tty_struct *tty = port->state->port.tty; |
749 | unsigned char ch, flag; | 749 | unsigned char ch, flag; |
750 | unsigned short status; | 750 | unsigned short status; |
751 | 751 | ||
@@ -812,7 +812,7 @@ mpc52xx_uart_int_rx_chars(struct uart_port *port) | |||
812 | static inline int | 812 | static inline int |
813 | mpc52xx_uart_int_tx_chars(struct uart_port *port) | 813 | mpc52xx_uart_int_tx_chars(struct uart_port *port) |
814 | { | 814 | { |
815 | struct circ_buf *xmit = &port->info->xmit; | 815 | struct circ_buf *xmit = &port->state->xmit; |
816 | 816 | ||
817 | /* Process out of band chars */ | 817 | /* Process out of band chars */ |
818 | if (port->x_char) { | 818 | if (port->x_char) { |