---

yaml --- r: 263415 b: refs/heads/master c: 0d0a3cc h: refs/heads/master i: 263413: b1e9514 263411: 356b3f6 263407: ee22f67 v: v3
git-mirror · Aug 22, 2011 · 9bd8339 · 9bd8339
1 parent 854a566
commit 9bd8339
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab8ba3a2d2cba6a658ef596cd5b2e0905b6c8a9f
+refs/heads/master: 0d0a3cc183c50956fe1d9e37cca520debea93ad5
diff --git a/trunk/drivers/tty/serial/atmel_serial.c b/trunk/drivers/tty/serial/atmel_serial.c
@@ -1609,9 +1609,11 @@ 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);
 	}