projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ab8ba3a
)
atmel_serial: fix atmel_default_console_device
author
Voss, Nikolaus
<N.Voss@weinmann.de>
Wed, 10 Aug 2011 12:02:29 +0000
(14:02 +0200)
committer
Greg Kroah-Hartman
<gregkh@suse.de>
Mon, 22 Aug 2011 21:18:44 +0000
(14:18 -0700)
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>
drivers/tty/serial/atmel_serial.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/tty/serial/atmel_serial.c
b/drivers/tty/serial/atmel_serial.c
index af9b7814965a461921d337047c068aed9bb5d051..b922f5d2e61e0cc52d4aea4ba9c81fca0b7fcc52 100644
(file)
--- 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);
}