diff options
| author | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-04-29 20:52:40 +0000 |
|---|---|---|
| committer | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-04-29 20:52:40 +0000 |
| commit | 5567fb5f50ff3acb3d039ded0bb2e0ad9522229c (patch) | |
| tree | 764c1ddefc2b47b2c40f809f4bd27bfa97418f3c /target/linux/ixp4xx/patches-2.6.30/191-cambria_optional_uart.patch | |
| parent | 22d6770b2214fda87af993282edc3f0c6de97d26 (diff) | |
resync ixp4xx 2.6.30 patches with -rc3
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15497 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.30/191-cambria_optional_uart.patch')
| -rw-r--r-- | target/linux/ixp4xx/patches-2.6.30/191-cambria_optional_uart.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.30/191-cambria_optional_uart.patch b/target/linux/ixp4xx/patches-2.6.30/191-cambria_optional_uart.patch index 3ffe7151d..c7b600a2e 100644 --- a/target/linux/ixp4xx/patches-2.6.30/191-cambria_optional_uart.patch +++ b/target/linux/ixp4xx/patches-2.6.30/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 -@@ -270,6 +270,7 @@ struct uart_port { +@@ -273,6 +273,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 */ -@@ -312,6 +313,7 @@ struct uart_port { +@@ -315,6 +316,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 -@@ -2142,6 +2142,7 @@ uart_report_port(struct uart_driver *drv +@@ -2138,6 +2138,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: -@@ -2556,6 +2557,7 @@ int uart_match_port(struct uart_port *po +@@ -2552,6 +2553,7 @@ int uart_match_port(struct uart_port *po case UPIO_HUB6: return (port1->iobase == port2->iobase) && (port1->hub6 == port2->hub6); |