[adm5120] do not overrid CONFIG_BRIDGE (#5163)

[openwrt.git] / target / linux / ar7 / patches-2.6.26 / 500-serial_kludge.patch

diff --git a/target/linux/ar7/patches-2.6.26/500-serial_kludge.patch b/target/linux/ar7/patches-2.6.26/500-serial_kludge.patch
index a40d4a3..6ce59ed 100644 (file)
--- a/target/linux/ar7/patches-2.6.26/500-serial_kludge.patch
+++ b/target/linux/ar7/patches-2.6.26/500-serial_kludge.patch
@@ -1,6 +1,6 @@
 --- a/drivers/serial/8250.c
 +++ b/drivers/serial/8250.c
 --- a/drivers/serial/8250.c
 +++ b/drivers/serial/8250.c

-@@ -267,6 +267,13 @@
+@@ -266,6 +266,13 @@ static const struct serial8250_config ua

                .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
                .flags          = UART_CAP_FIFO,
        },
                .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
                .flags          = UART_CAP_FIFO,
        },


@@ -14,7 +14,7 @@
  };
  
  #if defined (CONFIG_SERIAL_8250_AU1X00)
  };
  
  #if defined (CONFIG_SERIAL_8250_AU1X00)

-@@ -2455,7 +2462,11 @@
+@@ -2524,7 +2531,11 @@ static void serial8250_console_putchar(s

  {
        struct uart_8250_port *up = (struct uart_8250_port *)port;
  
  {
        struct uart_8250_port *up = (struct uart_8250_port *)port;