mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
[ixp4xx]: refresh 2.6.36 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23776 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user