diff options
author | Alan Cox <alan@redhat.com> | 2008-07-22 06:08:53 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-22 16:03:22 -0400 |
commit | 1aa3692da57c773e5c76de55c5c4a953962d360e (patch) | |
tree | 8f9453b2d07fe7e83a5d34ca076dbf424bcaf660 /drivers/serial/icom.c | |
parent | d35cb360c29956510b2fe1a953bd4968536f7216 (diff) |
ttydev: Fix up compile failures in the PPC build
Fix up a couple of reported merge problems
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/serial/icom.c')
-rw-r--r-- | drivers/serial/icom.c | 2 |
1 files changed, 1 insertions, 1 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) | |||
730 | static void recv_interrupt(u16 port_int_reg, struct icom_port *icom_port) | 730 | static void recv_interrupt(u16 port_int_reg, struct icom_port *icom_port) |
731 | { | 731 | { |
732 | short int count, rcv_buff; | 732 | short int count, rcv_buff; |
733 | struct tty_struct *tty = icom_port->uart_port.info->tty; | 733 | struct tty_struct *tty = icom_port->uart_port.info->port.tty; |
734 | unsigned short int status; | 734 | unsigned short int status; |
735 | struct uart_icount *icount; | 735 | struct uart_icount *icount; |
736 | unsigned long offset; | 736 | unsigned long offset; |