Received: from milmhbs1.lsil.com (147.145.21.209) by coscas01.lsi.com
 (172.21.36.60) with Microsoft SMTP Server id 8.1.393.1; Wed, 4 Nov 2009
 06:12:23 -0700
Received: from mail2.lsil.com (mail2.lsil.com [147.145.40.22])	by
 milmhbs1.lsil.com (8.12.11/8.12.11) with ESMTP id nA4DCGC8001190	for
 <andy.sharp@lsi.com>; Wed, 4 Nov 2009 05:12:19 -0800
Received: from psmtp.com (na3sys009amx236.postini.com [74.125.149.120])	by
 mail2.lsil.com (8.12.11/8.12.11) with SMTP id nA4D8Ouh017335	for
 <andy.sharp@lsi.com>; Wed, 4 Nov 2009 05:08:25 -0800 (PST)
Received: from source ([78.24.191.182]) by na3sys009amx236.postini.com
 ([74.125.148.14]) with SMTP;	Wed, 04 Nov 2009 08:12:15 EST
Received: from localhost.localdomain ([127.0.0.1]:46560 "EHLO
	eddie.linux-mips.org" rhost-flags-OK-OK-OK-FAIL) by ftp.linux-mips.org	with
 ESMTP id S1493263AbZKDNLx (ORCPT <rfc822;andy.sharp@lsi.com>);	Wed, 4 Nov
 2009 14:11:53 +0100
Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 04 Nov 2009 14:11:35
 +0100 (CET)
Received: from smtp6-g21.free.fr ([212.27.42.6]:60448 "EHLO smtp6-g21.free.fr"
	rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with ESMTP	id S1493264AbZKDNL3
 (ORCPT <rfc822;linux-mips@linux-mips.org>);	Wed, 4 Nov 2009 14:11:29 +0100
Received: from smtp6-g21.free.fr (localhost [127.0.0.1])	by smtp6-g21.free.fr
 (Postfix) with ESMTP id 4F159E081EC;	Wed,  4 Nov 2009 14:11:20 +0100 (CET)
Received: from [213.228.1.107] (sakura.staff.proxad.net [213.228.1.107])	by
 smtp6-g21.free.fr (Postfix) with ESMTP id 387D5E0811D;	Wed,  4 Nov 2009
 14:11:17 +0100 (CET)
From: Maxime Bizon <mbizon@freebox.fr>
To: Ralf Baechle <ralf@linux-mips.org>
CC: "linux-mips@linux-mips.org" <linux-mips@linux-mips.org>
Sender: "linux-mips-bounce@linux-mips.org" <linux-mips-bounce@linux-mips.org>
Date: Wed, 4 Nov 2009 06:11:15 -0700
Subject: [PATCH] MIPS: BCM63xx: Fix serial driver compile breakage.
Thread-Topic: [PATCH] MIPS: BCM63xx: Fix serial driver compile breakage.
Thread-Index: AcpdUHMi4j4aUu8iSlq7YNMdit3hhg==
Message-ID: <1257340275.2926.7.camel@sakura.staff.proxad.net>
Reply-To: "mbizon@freebox.fr" <mbizon@freebox.fr>
Accept-Language: en-US
Content-Language: en-US
X-MS-Exchange-Organization-AuthAs: Anonymous
X-MS-Exchange-Organization-AuthSource: coscas01.lsi.com
X-MS-Has-Attach:
X-Auto-Response-Suppress: All
X-MS-TNEF-Correlator:
x-scanned-by: MIMEDefang 2.39
errors-to: linux-mips-bounce@linux-mips.org
x-pstn-levels: (S:42.67749/99.90000 CV:99.9000 FC:95.5390 LC:95.5390
 R:95.9108 P:95.9108 M:97.0282 C:98.6951 )
x-pstn-settings: 3 (1.0000:1.0000) s cv gt3 gt2 gt1 r p m c 
x-pstn-addresses: from <mbizon@freebox.fr> [22/1] 
x-pstn-neptune: 0/0/0.00/0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0


Hi Ralf,

bcm63xx does not compile on current linus' tree, could you please apply
the attached patch and send it to linus ? Thanks !



The driver missed a small API change while sitting in Ralf's tree, this
patch makes it compile again.

Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
---
 drivers/serial/bcm63xx_uart.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/serial/bcm63xx_uart.c b/drivers/serial/bcm63xx_uart.c
index beddaa6..37ad0c4 100644
--- a/drivers/serial/bcm63xx_uart.c
+++ b/drivers/serial/bcm63xx_uart.c
@@ -242,7 +242,7 @@ static void bcm_uart_do_rx(struct uart_port *port)
 	 * higher than fifo size anyway since we're much faster than
 	 * serial port */
 	max_count =3D 32;
-	tty =3D port->info->port.tty;
+	tty =3D port->state->port.tty;
 	do {
 		unsigned int iestat, c, cstat;
 		char flag;
@@ -318,7 +318,7 @@ static void bcm_uart_do_tx(struct uart_port *port)
 		return;
 	}
=20
-	xmit =3D &port->info->xmit;
+	xmit =3D &port->state->xmit;
 	if (uart_circ_empty(xmit))
 		goto txq_empty;
=20
--=20
1.6.3.3




--=20
Maxime



