linux-next: manual merge of the tty tree with Linus' tree

linux-next: manual merge of the tty tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 482 bytes --]

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in
drivers/tty/serial/atmel_serial.c between commit 0d0a3cc183c5
("atmel_serial: fix atmel_default_console_device") from Linus' tree and
commit 4cbf9f4864bd ("tty/serial: atmel_serial: auto-enumerate ports")
from the tty tree.

I just used the tty tree version (which may not be completely correct).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the tty tree with Linus' tree

[Nicolas Ferre]

On 10/25/2011 10:18 AM, Stephen Rothwell :
> Hi Greg,
> 
> Today's linux-next merge of the tty tree got a conflict in 
> drivers/tty/serial/atmel_serial.c between commit 0d0a3cc183c5 
> ("atmel_serial: fix atmel_default_console_device") from Linus' tree
> and commit 4cbf9f4864bd ("tty/serial: atmel_serial: auto-enumerate
> ports") from the tty tree.
> 
> I just used the tty tree version (which may not be completely
> correct).

I sent a patch now to fix this conflict. It can be applied on both
current tty-next and linux-next (obviously).

Sorry for the noise and thank you to having take care of this.

Best regards,
-- 
Nicolas Ferre

[PATCH] tty/serial: atmel_serial: fixup merge conflict

[Nicolas Ferre]

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