diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-09-15 16:06:11 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-09-15 16:06:11 -0700 |
| commit | ceb1c532ba6220900e61ec7073a9234661efa450 (patch) | |
| tree | b7c5b94f09a6893625bb12b7795de3d44fece450 /drivers/tty/serial/atmel_serial.c | |
| parent | 8f5b5a41ebc750ffcc2c410371b2b4998955709e (diff) | |
| parent | 00c46b3069c1ee9aa31db3057e9224685af52efa (diff) | |
| download | linux-next-ceb1c532ba6220900e61ec7073a9234661efa450.tar.gz | |
Merge branch 'omap_chip_remove_cleanup_3.2' of git://git.pwsan.com/linux-2.6 into cleanup
Diffstat (limited to 'drivers/tty/serial/atmel_serial.c')
| -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); } |