diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-08-14 13:06:33 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-08-14 13:06:33 +0000 |
| commit | 6be2305da83471c442dab83366c25be4dfb38793 (patch) | |
| tree | 30cfe6f3fc964dca1936646468c87367b509e929 /target/linux/ixp4xx | |
| parent | 8e69c9f7ef2e1ca40b33a4a33c76b460c1f62861 (diff) | |
| download | upstream-6be2305da83471c442dab83366c25be4dfb38793.tar.gz upstream-6be2305da83471c442dab83366c25be4dfb38793.tar.bz2 upstream-6be2305da83471c442dab83366c25be4dfb38793.zip | |
kernel: update 4.1 to 4.1.5
Changelog:
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.5
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 46598
Diffstat (limited to 'target/linux/ixp4xx')
| -rw-r--r-- | target/linux/ixp4xx/patches-4.1/160-delayed_uart_io.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ixp4xx/patches-4.1/160-delayed_uart_io.patch b/target/linux/ixp4xx/patches-4.1/160-delayed_uart_io.patch index ec226a9c2a..e44740d6f7 100644 --- a/target/linux/ixp4xx/patches-4.1/160-delayed_uart_io.patch +++ b/target/linux/ixp4xx/patches-4.1/160-delayed_uart_io.patch @@ -75,7 +75,7 @@ uart->tx_loadsz = up->tx_loadsz; --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c -@@ -2176,6 +2176,7 @@ uart_report_port(struct uart_driver *drv +@@ -2177,6 +2177,7 @@ uart_report_port(struct uart_driver *drv snprintf(address, sizeof(address), "I/O 0x%lx offset 0x%x", port->iobase, port->hub6); break; @@ -83,7 +83,7 @@ case UPIO_MEM: case UPIO_MEM32: case UPIO_MEM32BE: -@@ -2823,6 +2824,7 @@ int uart_match_port(struct uart_port *po +@@ -2824,6 +2825,7 @@ int uart_match_port(struct uart_port *po case UPIO_HUB6: return (port1->iobase == port2->iobase) && (port1->hub6 == port2->hub6); |