diff options
| author | Voss, Nikolaus | 2011-08-10 14:02:29 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-08-22 23:18:44 +0200 |
| commit | 0d0a3cc183c50956fe1d9e37cca520debea93ad5 (patch) | |
| tree | 56cf5fb993cee8b27b9761f862f5128e406223e7 | |
| parent | serial: 8250_pnp: add Intermec CV60 touchscreen device (diff) | |
| download | kernel-qcow2-linux-0d0a3cc183c50956fe1d9e37cca520debea93ad5.tar.gz kernel-qcow2-linux-0d0a3cc183c50956fe1d9e37cca520debea93ad5.tar.xz kernel-qcow2-linux-0d0a3cc183c50956fe1d9e37cca520debea93ad5.zip | |
atmel_serial: fix atmel_default_console_device
reflect new static uart platform ids introduced by patch
http://article.gmane.org/gmane.linux.kernel/1126105
Signed-off-by: Nikolaus Voss <n.voss@weinmann.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/tty/serial/atmel_serial.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c index af9b7814965a..b922f5d2e61e 100644 --- a/drivers/tty/serial/atmel_serial.c +++ b/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); } |