diff options
| author | Alan Cox <alan@redhat.com> | 2008-07-10 16:29:25 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-10 16:29:25 +1000 |
| commit | 749e7bb23c4d1665ab0db8e6741ebdce52fe9482 (patch) | |
| tree | 5e52aba84fa972bba9c14667ea4561ea69c70a9e /drivers | |
| parent | 6f73c3acd9fc9593f332a0f4d685c69726663605 (diff) | |
87-tty-ppc-fixes
Fix up a couple of reported merge problems
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/icom.c | 2 | ||||
| -rw-r--r-- | drivers/serial/serial_txx9.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/icom.c b/drivers/serial/icom.c index 9c2df5c857cf..2b7531d9f6ab 100644 --- a/drivers/serial/icom.c +++ b/drivers/serial/icom.c @@ -730,7 +730,7 @@ static void xmit_interrupt(u16 port_int_reg, struct icom_port *icom_port) static void recv_interrupt(u16 port_int_reg, struct icom_port *icom_port) { short int count, rcv_buff; - struct tty_struct *tty = icom_port->uart_port.info->tty; + struct tty_struct *tty = icom_port->uart_port.info->port.tty; unsigned short int status; struct uart_icount *icount; unsigned long offset; diff --git a/drivers/serial/serial_txx9.c b/drivers/serial/serial_txx9.c index 7ad21925869a..8fcb4c5b9a26 100644 --- a/drivers/serial/serial_txx9.c +++ b/drivers/serial/serial_txx9.c @@ -272,7 +272,7 @@ static void serial_txx9_initialize(struct uart_port *port) static inline void receive_chars(struct uart_txx9_port *up, unsigned int *status) { - struct tty_struct *tty = up->port.info->tty; + struct tty_struct *tty = up->port.info->port.tty; unsigned char ch; unsigned int disr = *status; int max_count = 256; |