Commit 1aa3692d authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

ttydev: Fix up compile failures in the PPC build

Fix up a couple of reported merge problems
Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d35cb360
...@@ -730,7 +730,7 @@ static void xmit_interrupt(u16 port_int_reg, struct icom_port *icom_port) ...@@ -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) static void recv_interrupt(u16 port_int_reg, struct icom_port *icom_port)
{ {
short int count, rcv_buff; 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; unsigned short int status;
struct uart_icount *icount; struct uart_icount *icount;
unsigned long offset; unsigned long offset;
......
...@@ -272,7 +272,7 @@ static void serial_txx9_initialize(struct uart_port *port) ...@@ -272,7 +272,7 @@ static void serial_txx9_initialize(struct uart_port *port)
static inline void static inline void
receive_chars(struct uart_txx9_port *up, unsigned int *status) 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 char ch;
unsigned int disr = *status; unsigned int disr = *status;
int max_count = 256; int max_count = 256;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment