Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755784AbYGVAZj (ORCPT ); Mon, 21 Jul 2008 20:25:39 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754928AbYGVAZb (ORCPT ); Mon, 21 Jul 2008 20:25:31 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:51554 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754902AbYGVAZb (ORCPT ); Mon, 21 Jul 2008 20:25:31 -0400 Date: Tue, 22 Jul 2008 10:25:20 +1000 From: Stephen Rothwell To: Linus Torvalds Cc: linux-next@vger.kernel.org, Alan Cox , LKML , ppc-dev Subject: [PATCH] serial: fix struct uart_info change fallout Message-Id: <20080722102520.ca801ab5.sfr@canb.auug.org.au> X-Mailer: Sylpheed 2.5.0 (GTK+ 2.12.11; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2008 Lines: 54 Hi Linus, Alan, Today's linux-next (actually just Linus' tree) build (powerpc ppc64_defconfig) failed like this: drivers/serial/serial_txx9.c: In function 'receive_chars': drivers/serial/serial_txx9.c:275: error: 'struct uart_info' has no member named 'tty' drivers/serial/icom.c: In function 'recv_interrupt': drivers/serial/icom.c:733: error: 'struct uart_info' has no member named 'tty' Signed-off-by: Stephen Rothwell --- drivers/serial/icom.c | 2 +- drivers/serial/serial_txx9.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/serial/icom.c b/drivers/serial/icom.c index 9c2df5c..2b7531d 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) 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; diff --git a/drivers/serial/serial_txx9.c b/drivers/serial/serial_txx9.c index 7ad2192..8fcb4c5 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; -- 1.5.6.2 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/