diff options
| author | Voss, Nikolaus <N.Voss@weinmann.de> | 2011-08-10 08:02:29 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-22 17:18:44 -0400 |
| commit | 0d0a3cc183c50956fe1d9e37cca520debea93ad5 (patch) | |
| tree | 56cf5fb993cee8b27b9761f862f5128e406223e7 | |
| parent | ab8ba3a2d2cba6a658ef596cd5b2e0905b6c8a9f (diff) | |
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 = { | |||
| 1609 | static int __init atmel_console_init(void) | 1609 | static int __init atmel_console_init(void) |
| 1610 | { | 1610 | { |
| 1611 | if (atmel_default_console_device) { | 1611 | if (atmel_default_console_device) { |
| 1612 | add_preferred_console(ATMEL_DEVICENAME, | 1612 | struct atmel_uart_data *pdata = |
| 1613 | atmel_default_console_device->id, NULL); | 1613 | atmel_default_console_device->dev.platform_data; |
| 1614 | atmel_init_port(&atmel_ports[atmel_default_console_device->id], | 1614 | |
| 1615 | add_preferred_console(ATMEL_DEVICENAME, pdata->num, NULL); | ||
| 1616 | atmel_init_port(&atmel_ports[pdata->num], | ||
| 1615 | atmel_default_console_device); | 1617 | atmel_default_console_device); |
| 1616 | register_console(&atmel_console); | 1618 | register_console(&atmel_console); |
| 1617 | } | 1619 | } |
