kernel: bump 4.14 to 4.14.107

[openwrt/openwrt.git] / target / linux / generic / backport-4.14 / 060-v5.1-serial-ar933x_uart-Fix-build-failure-with-disabled-c.patch

diff --git a/target/linux/generic/backport-4.14/060-v5.1-serial-ar933x_uart-Fix-build-failure-with-disabled-c.patch b/target/linux/generic/backport-4.14/060-v5.1-serial-ar933x_uart-Fix-build-failure-with-disabled-c.patch
index cb653170efcb0745af434229ec6a1620fd8a1c7e..657a869493b454a21ad19d941ebd440f5ad60715 100644 (file)
--- a/target/linux/generic/backport-4.14/060-v5.1-serial-ar933x_uart-Fix-build-failure-with-disabled-c.patch
+++ b/target/linux/generic/backport-4.14/060-v5.1-serial-ar933x_uart-Fix-build-failure-with-disabled-c.patch
@@ -31,11 +31,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  drivers/tty/serial/ar933x_uart.c | 24 ++++++++----------------
  1 file changed, 8 insertions(+), 16 deletions(-)
 
-diff --git a/drivers/tty/serial/ar933x_uart.c b/drivers/tty/serial/ar933x_uart.c
-index db5df3d..3bdd56a 100644
 --- a/drivers/tty/serial/ar933x_uart.c
 +++ b/drivers/tty/serial/ar933x_uart.c
-@@ -49,11 +49,6 @@ struct ar933x_uart_port {
+@@ -52,11 +52,6 @@ struct ar933x_uart_port {
        struct clk              *clk;
  };
  
@@ -47,7 +45,7 @@ index db5df3d..3bdd56a 100644
  static inline unsigned int ar933x_uart_read(struct ar933x_uart_port *up,
                                            int offset)
  {
-@@ -508,6 +503,7 @@ static int ar933x_uart_verify_port(struct uart_port *port,
+@@ -511,6 +506,7 @@ static const struct uart_ops ar933x_uart
        .verify_port    = ar933x_uart_verify_port,
  };
  
@@ -55,7 +53,7 @@ index db5df3d..3bdd56a 100644
  static struct ar933x_uart_port *
  ar933x_console_ports[CONFIG_SERIAL_AR933X_NR_UARTS];
  
-@@ -604,14 +600,7 @@ static int ar933x_uart_console_setup(struct console *co, char *options)
+@@ -607,14 +603,7 @@ static struct console ar933x_uart_consol
        .index          = -1,
        .data           = &ar933x_uart_driver,
  };
@@ -71,7 +69,7 @@ index db5df3d..3bdd56a 100644
  
  static struct uart_driver ar933x_uart_driver = {
        .owner          = THIS_MODULE,
-@@ -700,7 +689,9 @@ static int ar933x_uart_probe(struct platform_device *pdev)
+@@ -703,7 +692,9 @@ static int ar933x_uart_probe(struct plat
        baud = ar933x_uart_get_baud(port->uartclk, 0, AR933X_UART_MAX_STEP);
        up->max_baud = min_t(unsigned int, baud, AR933X_UART_MAX_BAUD);
  
@@ -82,7 +80,7 @@ index db5df3d..3bdd56a 100644
  
        ret = uart_add_one_port(&ar933x_uart_driver, &up->port);
        if (ret)
-@@ -749,8 +740,9 @@ static int __init ar933x_uart_init(void)
+@@ -752,8 +743,9 @@ static int __init ar933x_uart_init(void)
  {
        int ret;
  
@@ -94,6 +92,3 @@ index db5df3d..3bdd56a 100644
  
        ret = uart_register_driver(&ar933x_uart_driver);
        if (ret)
--- 
-1.9.1
-