From 9bd83396e653e67adc21cddc5cbf1d64664b9f9c Mon Sep 17 00:00:00 2001 From: "Voss, Nikolaus" Date: Wed, 10 Aug 2011 14:02:29 +0200 Subject: [PATCH] --- yaml --- r: 263415 b: refs/heads/master c: 0d0a3cc183c50956fe1d9e37cca520debea93ad5 h: refs/heads/master i: 263413: b1e95147abae8ab8d8acb0d8eb686a70353bafe8 263411: 356b3f69157259ae26b5988686d8e73a488de910 263407: ee22f67c210b9e2a48ccaa798c38cc2a047eef61 v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/atmel_serial.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 83bd978eb292..3e92cfad0e78 100644 --- 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 index af9b7814965a..b922f5d2e61e 100644 --- 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); }