git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'devel', 'devel-stable' and 'fixes' into for-linus
[pandora-kernel.git]
/
drivers
/
tty
/
serial
/
atmel_serial.c
diff --git
a/drivers/tty/serial/atmel_serial.c
b/drivers/tty/serial/atmel_serial.c
index
652bdac
..
6d5d6e6
100644
(file)
--- a/
drivers/tty/serial/atmel_serial.c
+++ b/
drivers/tty/serial/atmel_serial.c
@@
-1420,7
+1420,7
@@
static void __devinit atmel_init_port(struct atmel_uart_port *atmel_port,
port->flags = UPF_BOOT_AUTOCONF;
port->ops = &atmel_pops;
port->fifosize = 1;
- port->line =
pdev->id
;
+ port->line =
data->num
;
port->dev = &pdev->dev;
port->mapbase = pdev->resource[0].start;
port->irq = pdev->resource[1].start;