aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-01-31 15:56:42 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-02-01 11:41:00 +0100
commit604eb945508e32aeaf4dbfd5ffb5137de6223b38 (patch)
tree9711eb5fd6441e42e9ef9d4c0c1a32b60ff84c44 /target/linux/ixp4xx
parent9687cc855644e5649156e2a52ebca6fa61fc362f (diff)
downloadupstream-604eb945508e32aeaf4dbfd5ffb5137de6223b38.tar.gz
upstream-604eb945508e32aeaf4dbfd5ffb5137de6223b38.tar.bz2
upstream-604eb945508e32aeaf4dbfd5ffb5137de6223b38.zip
kernel: bump 4.9 to 4.9.154
Refreshed all patches. Adapted patches: - 012-kbuild-add-macro-for-controlling-warnings-to-linux-c.patch Compile-tested on: ar7 Runtime-tested on: none Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/ixp4xx')
-rw-r--r--target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch b/target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch
index 12df228516..4e13ec950c 100644
--- a/target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch
+++ b/target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch
@@ -18,7 +18,7 @@
uart->capabilities = up->capabilities;
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
-@@ -2250,6 +2250,7 @@ uart_report_port(struct uart_driver *drv
+@@ -2254,6 +2254,7 @@ uart_report_port(struct uart_driver *drv
snprintf(address, sizeof(address),
"I/O 0x%lx offset 0x%x", port->iobase, port->hub6);
break;
@@ -26,7 +26,7 @@
case UPIO_MEM:
case UPIO_MEM16:
case UPIO_MEM32:
-@@ -2914,6 +2915,7 @@ int uart_match_port(struct uart_port *po
+@@ -2918,6 +2919,7 @@ int uart_match_port(struct uart_port *po
case UPIO_HUB6:
return (port1->iobase == port2->iobase) &&
(port1->hub6 == port2->hub6);