[kernel] x86: Sync kernel config

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

diff --git a/target/linux/ar7/patches-2.6.25/500-serial_kludge.patch b/target/linux/ar7/patches-2.6.25/500-serial_kludge.patch
index 69335be..a40d4a3 100644 (file)
--- a/target/linux/ar7/patches-2.6.25/500-serial_kludge.patch
+++ b/target/linux/ar7/patches-2.6.25/500-serial_kludge.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/drivers/serial/8250.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/serial/8250.c
-+++ linux-2.6.25.4/drivers/serial/8250.c
-@@ -267,6 +267,13 @@ static const struct serial8250_config ua
+--- a/drivers/serial/8250.c
++++ b/drivers/serial/8250.c
+@@ -267,6 +267,13 @@
                .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
                .flags          = UART_CAP_FIFO,
        },
@@ -16,7 +14,7 @@ Index: linux-2.6.25.4/drivers/serial/8250.c
  };
  
  #if defined (CONFIG_SERIAL_8250_AU1X00)
-@@ -2455,7 +2462,11 @@ static void serial8250_console_putchar(s
+@@ -2455,7 +2462,11 @@
  {
        struct uart_8250_port *up = (struct uart_8250_port *)port;
  
@@ -28,10 +26,8 @@ Index: linux-2.6.25.4/drivers/serial/8250.c
        serial_out(up, UART_TX, ch);
  }
  
-Index: linux-2.6.25.4/include/linux/serial_core.h
-===================================================================
---- linux-2.6.25.4.orig/include/linux/serial_core.h
-+++ linux-2.6.25.4/include/linux/serial_core.h
+--- a/include/linux/serial_core.h
++++ b/include/linux/serial_core.h
 @@ -40,7 +40,8 @@
  #define PORT_NS16550A 14
  #define PORT_XSCALE   15