projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update 3.10 to 3.10.32
[openwrt.git]
/
target
/
linux
/
ixp4xx
/
patches-3.10
/
160-delayed_uart_io.patch
diff --git
a/target/linux/ixp4xx/patches-3.10/160-delayed_uart_io.patch
b/target/linux/ixp4xx/patches-3.10/160-delayed_uart_io.patch
index
d24eb37
..
c9cfabb
100644
(file)
--- a/
target/linux/ixp4xx/patches-3.10/160-delayed_uart_io.patch
+++ b/
target/linux/ixp4xx/patches-3.10/160-delayed_uart_io.patch
@@
-57,7
+57,7
@@
if (!port->mapbase)
break;
if (!port->mapbase)
break;
-@@ -309
1,6 +3113
,7 @@ static int serial8250_probe(struct platf
+@@ -309
5,6 +3117
,7 @@ static int serial8250_probe(struct platf
uart.port.set_termios = p->set_termios;
uart.port.pm = p->pm;
uart.port.dev = &dev->dev;
uart.port.set_termios = p->set_termios;
uart.port.pm = p->pm;
uart.port.dev = &dev->dev;
@@
-65,7
+65,7
@@
uart.port.irqflags |= irqflag;
ret = serial8250_register_8250_port(&uart);
if (ret < 0) {
uart.port.irqflags |= irqflag;
ret = serial8250_register_8250_port(&uart);
if (ret < 0) {
-@@ -324
2,6 +3265
,7 @@ int serial8250_register_8250_port(struct
+@@ -324
6,6 +3269
,7 @@ int serial8250_register_8250_port(struct
uart->port.flags = up->port.flags | UPF_BOOT_AUTOCONF;
uart->bugs = up->bugs;
uart->port.mapbase = up->port.mapbase;
uart->port.flags = up->port.flags | UPF_BOOT_AUTOCONF;
uart->bugs = up->bugs;
uart->port.mapbase = up->port.mapbase;