diff options
author | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-01-31 13:46:17 +0000 |
---|---|---|
committer | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-01-31 13:46:17 +0000 |
commit | 42e1fa9f9b0113eb00fe9fa8242cf651aa7e41b3 (patch) | |
tree | 1854127fb1ae9aabac999004a2c2bef597d70219 /target/linux | |
parent | 0e069faefd0310e7c905c3452443371f02832cc7 (diff) |
refresh patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19447 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r-- | target/linux/ixp4xx/patches-2.6.32/191-cambria_optional_uart.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.32/191-cambria_optional_uart.patch b/target/linux/ixp4xx/patches-2.6.32/191-cambria_optional_uart.patch index e41b7e1ad6..0e12f6e87d 100644 --- a/target/linux/ixp4xx/patches-2.6.32/191-cambria_optional_uart.patch +++ b/target/linux/ixp4xx/patches-2.6.32/191-cambria_optional_uart.patch @@ -165,7 +165,7 @@ #ifdef CONFIG_SERIAL_8250_AU1X00 case UPIO_AU: #endif -@@ -2451,6 +2471,7 @@ static int serial8250_request_std_resour +@@ -2449,6 +2469,7 @@ static int serial8250_request_std_resour case UPIO_MEM32: case UPIO_MEM: case UPIO_DWAPB: @@ -173,7 +173,7 @@ if (!up->port.mapbase) break; -@@ -2488,6 +2509,7 @@ static void serial8250_release_std_resou +@@ -2486,6 +2507,7 @@ static void serial8250_release_std_resou case UPIO_MEM32: case UPIO_MEM: case UPIO_DWAPB: @@ -181,7 +181,7 @@ if (!up->port.mapbase) break; -@@ -2960,6 +2982,7 @@ static int __devinit serial8250_probe(st +@@ -2958,6 +2980,7 @@ static int __devinit serial8250_probe(st port.serial_in = p->serial_in; port.serial_out = p->serial_out; port.dev = &dev->dev; @@ -189,7 +189,7 @@ if (share_irqs) port.irqflags |= IRQF_SHARED; ret = serial8250_register_port(&port); -@@ -3110,6 +3133,7 @@ int serial8250_register_port(struct uart +@@ -3108,6 +3131,7 @@ int serial8250_register_port(struct uart uart->port.iotype = port->iotype; uart->port.flags = port->flags | UPF_BOOT_AUTOCONF; uart->port.mapbase = port->mapbase; |