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

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

drivers/serial/icom.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/serial/serial_txx9.c

+1 −1
Original line number Diff line number Diff line
@@ -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;