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; Thu, 5 Nov 2009
 10:56:37 -0700
Received: from mail1.lsil.com (mail1.lsil.com [147.145.40.21])	by
 milmhbs1.lsil.com (8.12.11/8.12.11) with ESMTP id nA5HuOuh024410	for
 <andy.sharp@lsi.com>; Thu, 5 Nov 2009 09:56:26 -0800
Received: from psmtp.com (na3sys009amx241.postini.com [74.125.149.125])	by
 mail1.lsil.com (8.12.11/8.12.11) with SMTP id nA5HuLqO015846	for
 <andy.sharp@lsi.com>; Thu, 5 Nov 2009 09:56:22 -0800 (PST)
Received: from source ([78.24.191.182]) by na3sys009amx241.postini.com
 ([74.125.148.14]) with SMTP;	Thu, 05 Nov 2009 11:56:23 CST
Received: from localhost.localdomain ([127.0.0.1]:58927 "EHLO
	eddie.linux-mips.org" rhost-flags-OK-OK-OK-FAIL) by ftp.linux-mips.org	with
 ESMTP id S1493049AbZKER4D (ORCPT <rfc822;andy.sharp@lsi.com>);	Thu, 5 Nov
 2009 18:56:03 +0100
Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 05 Nov 2009 18:55:45
 +0100 (CET)
Received: from localhost.localdomain ([127.0.0.1]:58907 "EHLO h5.dl5rb.org.uk"
	rhost-flags-OK-OK-OK-FAIL) by ftp.linux-mips.org with ESMTP	id
 S1492947AbZKERzm (ORCPT <rfc822;linux-mips@linux-mips.org>);	Thu, 5 Nov 2009
 18:55:42 +0100
Received: from h5.dl5rb.org.uk (localhost.localdomain [127.0.0.1])	by
 h5.dl5rb.org.uk (8.14.3/8.14.3) with ESMTP id nA5Hv1uu024925;	Thu, 5 Nov 2009
 18:57:02 +0100
Received: (from ralf@localhost)	by h5.dl5rb.org.uk (8.14.3/8.14.3/Submit) id
 nA5HuxEt024923;	Thu, 5 Nov 2009 18:56:59 +0100
From: Ralf Baechle <ralf@linux-mips.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
CC: Maxime Bizon <mbizon@freebox.fr>, "linux-mips@linux-mips.org"
	<linux-mips@linux-mips.org>, "linux-serial@vger.kernel.org"
	<linux-serial@vger.kernel.org>, "linux-kernel@vger.kernel.org"
	<linux-kernel@vger.kernel.org>
Sender: "linux-mips-bounce@linux-mips.org" <linux-mips-bounce@linux-mips.org>
Date: Thu, 5 Nov 2009 08:26:04 -0700
Subject: [PATCH 6/6] SERIAL: BCM63xx: Fix serial driver compile breakage.
Thread-Topic: [PATCH 6/6] SERIAL: BCM63xx: Fix serial driver compile
 breakage.
Thread-Index: AcpeQVJHYtqspJZjREysGO3f3Gneog==
Message-ID: <20091105152702.606651698@linux-mips.org>
References: <20091105152555.227009519@linux-mips.org>
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:60.90685/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 <ralf@linux-mips.org> [22/1] 
x-pstn-neptune: 1/1/1.00/79
user-agent: quilt/0.47-1
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

From: Maxime Bizon <mbizon@freebox.fr>

The driver missed an API change.

Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
Cc: linux-mips@linux-mips.org
Cc: linux-serial@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

 drivers/serial/bcm63xx_uart.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: upstream-linus/drivers/serial/bcm63xx_uart.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- upstream-linus.orig/drivers/serial/bcm63xx_uart.c
+++ upstream-linus/drivers/serial/bcm63xx_uart.c
@@ -242,7 +242,7 @@ static void bcm_uart_do_rx(struct uart_p
 	 * 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_p
 		return;
 	}
=20
-	xmit =3D &port->info->xmit;
+	xmit =3D &port->state->xmit;
 	if (uart_circ_empty(xmit))
 		goto txq_empty;
=20



