linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Nicolas Ferre <nicolas.ferre@atmel.com>
To: sfr@canb.auug.org.au, greg@kroah.com
Cc: linux-kernel@vger.kernel.org, linux-next@vger.kernel.org,
	N.Voss@weinmann.de, nicolas.ferre@atmel.com
Subject: [PATCH] tty/serial: atmel_serial: fixup merge conflict
Date: Tue, 25 Oct 2011 12:05:29 +0200	[thread overview]
Message-ID: <1319537129-7164-1-git-send-email-nicolas.ferre@atmel.com> (raw)
In-Reply-To: <4EA68955.8010102@atmel.com>

Proper atmel_console_init() merge using platform data.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
 drivers/tty/serial/atmel_serial.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
index 358bbb2..9988c0c 100644
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@ -1671,7 +1671,9 @@ static struct console atmel_console = {
 static int __init atmel_console_init(void)
 {
 	if (atmel_default_console_device) {
-		int id = atmel_default_console_device->id;
+		struct atmel_uart_data *pdata =
+			atmel_default_console_device->dev.platform_data;
+		int id = pdata->num;
 		struct atmel_uart_port *port = &atmel_ports[id];
 
 		port->backup_imr = 0;
-- 
1.7.5.4

      reply	other threads:[~2011-10-25 10:05 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-25  8:18 linux-next: manual merge of the tty tree with Linus' tree Stephen Rothwell
2011-10-25 10:03 ` Nicolas Ferre
2011-10-25 10:05   ` Nicolas Ferre [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1319537129-7164-1-git-send-email-nicolas.ferre@atmel.com \
    --to=nicolas.ferre@atmel.com \
    --cc=N.Voss@weinmann.de \
    --cc=greg@kroah.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).