From 1aa3692da57c773e5c76de55c5c4a953962d360e Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Tue, 22 Jul 2008 11:08:53 +0100 Subject: ttydev: Fix up compile failures in the PPC build Fix up a couple of reported merge problems Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds --- drivers/serial/serial_txx9.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/serial/serial_txx9.c') 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; -- cgit v1.2.2