aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2010-01-31 13:46:17 +0000
committerImre Kaloz <kaloz@openwrt.org>2010-01-31 13:46:17 +0000
commit0d5e3e1c454f4af8a447aeeb5d04eb555e43d13f (patch)
tree22aeda4e60bb9807b20030e588ee43e959b04ff0 /target/linux
parent9ab88ce62da56b2c6132c8331f2528349ddda125 (diff)
downloadupstream-0d5e3e1c454f4af8a447aeeb5d04eb555e43d13f.tar.gz
upstream-0d5e3e1c454f4af8a447aeeb5d04eb555e43d13f.tar.bz2
upstream-0d5e3e1c454f4af8a447aeeb5d04eb555e43d13f.zip
refresh patch
SVN-Revision: 19447
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/ixp4xx/patches-2.6.32/191-cambria_optional_uart.patch8
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;