From patchwork Mon Aug 8 15:10:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Voss, Nikolaus" X-Patchwork-Id: 1045522 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p78FFcJM023044 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 8 Aug 2011 15:16:00 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QqRXx-00084Y-De; Mon, 08 Aug 2011 15:15:17 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QqRXw-0001Wg-UY; Mon, 08 Aug 2011 15:15:16 +0000 Received: from lo.gmane.org ([80.91.229.12]) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QqRXt-0001WL-F1 for linux-arm-kernel@lists.infradead.org; Mon, 08 Aug 2011 15:15:14 +0000 Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1QqRXp-00013C-2b for linux-arm-kernel@lists.infradead.org; Mon, 08 Aug 2011 17:15:09 +0200 Received: from d213136.adsl.hansenet.de ([80.171.213.136]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 08 Aug 2011 17:15:09 +0200 Received: from n.voss by d213136.adsl.hansenet.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 08 Aug 2011 17:15:09 +0200 X-Injected-Via-Gmane: http://gmane.org/ To: linux-arm-kernel@lists.infradead.org From: Nikolaus Voss Subject: [PATCH] =?utf-8?b?YXRtZWxfc2VyaWFsOg==?= fix =?utf-8?b?YXRtZWxfZGVmYXVsdF9jb25zb2xlX2RldmljZQ==?= Date: Mon, 8 Aug 2011 15:10:01 +0000 (UTC) Lines: 31 Message-ID: References: <1307541740.10626.15.camel@hcegtvedt.norway.atmel.com> <1308666679-12111-1-git-send-email-plagnioj@jcrosoft.com> Mime-Version: 1.0 X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: sea.gmane.org User-Agent: Loom/3.14 (http://gmane.org/) X-Loom-IP: 80.171.213.136 (Mozilla/5.0 (X11; Linux x86_64; rv:5.0) Gecko/20100101 Firefox/5.0) X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110808_111513_681647_AE4E3732 X-CRM114-Status: GOOD ( 13.45 ) X-Spam-Score: -3.1 (---) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-3.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.8 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [80.91.229.12 listed in list.dnswl.org] X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 08 Aug 2011 15:16:00 +0000 (UTC) reflect new static uart platform ids introduced by patch http://article.gmane.org/gmane.linux.kernel/1126105 Signed-off-by: Nikolaus Voss --- drivers/tty/serial/atmel_serial.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/tty/serial/atmel_serial.c \ b/drivers/tty/serial/atmel_serial.c index af9b781..29c7857 100644 --- a/drivers/tty/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c @@ -1609,9 +1609,10 @@ static struct console atmel_console = { static int __init atmel_console_init(void) { if (atmel_default_console_device) { - add_preferred_console(ATMEL_DEVICENAME, - atmel_default_console_device->id, NULL); - atmel_init_port(&atmel_ports[atmel_default_console_device->id], + struct atmel_uart_data *pdata = + atmel_default_console_device->dev.platform_data; + add_preferred_console(ATMEL_DEVICENAME, pdata->num, NULL); + atmel_init_port(&atmel_ports[pdata->num], atmel_default_console_device); register_console(&atmel_console); }