ttydev: Fix up compile failures in the PPC build
authorAlan Cox <alan@redhat.com>
Tue, 22 Jul 2008 10:08:53 +0000 (11:08 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Jul 2008 20:03:22 +0000 (13:03 -0700)
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>
drivers/serial/icom.c
drivers/serial/serial_txx9.c

index 9c2df5c857cfc85ff46e8378b786a4dd32602bba..2b7531d9f6abcfa72c9872bcea48ef9a5cf593c6 100644 (file)
@@ -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;
index 7ad21925869a0550465b56bac0e5a7c771f2fb31..8fcb4c5b9a263b2db8897fe9360dec3943552569 100644 (file)
@@ -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;