diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2010-11-02 12:21:31 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2010-11-02 12:21:31 +0000 |
| commit | c1209bde02769789149b5e83840361fce0a2e070 (patch) | |
| tree | b60f67d807bfc65af47df8122e26d19ba5a9e212 /target/linux/ixp4xx/patches-2.6.36/191-cambria_optional_uart.patch | |
| parent | d50ec0371001b81c5efacab6729b7cb0533d8adf (diff) | |
| download | upstream-c1209bde02769789149b5e83840361fce0a2e070.tar.gz upstream-c1209bde02769789149b5e83840361fce0a2e070.tar.bz2 upstream-c1209bde02769789149b5e83840361fce0a2e070.zip | |
refresh 2.6.36 patches
SVN-Revision: 23776
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.36/191-cambria_optional_uart.patch')
| -rw-r--r-- | target/linux/ixp4xx/patches-2.6.36/191-cambria_optional_uart.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.36/191-cambria_optional_uart.patch b/target/linux/ixp4xx/patches-2.6.36/191-cambria_optional_uart.patch index 98eca4a575..6ce151d5bf 100644 --- a/target/linux/ixp4xx/patches-2.6.36/191-cambria_optional_uart.patch +++ b/target/linux/ixp4xx/patches-2.6.36/191-cambria_optional_uart.patch @@ -106,7 +106,7 @@ unsigned int type; /* If UPF_FIXED_TYPE */ --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h -@@ -293,6 +293,7 @@ struct uart_port { +@@ -306,6 +306,7 @@ struct uart_port { #define UPIO_TSI (5) /* Tsi108/109 type IO */ #define UPIO_DWAPB (6) /* DesignWare APB UART */ #define UPIO_RM9000 (7) /* RM9000 type IO */ @@ -114,7 +114,7 @@ unsigned int read_status_mask; /* driver specific */ unsigned int ignore_status_mask; /* driver specific */ -@@ -335,6 +336,7 @@ struct uart_port { +@@ -348,6 +349,7 @@ struct uart_port { unsigned int mctrl; /* current modem ctrl settings */ unsigned int timeout; /* character-based timeout */ @@ -199,7 +199,7 @@ uart->port.dev = port->dev; --- a/drivers/serial/serial_core.c +++ b/drivers/serial/serial_core.c -@@ -2144,6 +2144,7 @@ uart_report_port(struct uart_driver *drv +@@ -2122,6 +2122,7 @@ uart_report_port(struct uart_driver *drv snprintf(address, sizeof(address), "I/O 0x%lx offset 0x%x", port->iobase, port->hub6); break; @@ -207,7 +207,7 @@ case UPIO_MEM: case UPIO_MEM32: case UPIO_AU: -@@ -2557,6 +2558,7 @@ int uart_match_port(struct uart_port *po +@@ -2541,6 +2542,7 @@ int uart_match_port(struct uart_port *po case UPIO_HUB6: return (port1->iobase == port2->iobase) && (port1->hub6 == port2->hub6); |