diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2011-07-06 12:57:51 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2011-07-06 12:57:51 +0000 |
| commit | 5be3ae8fe593fa92500391113d60f08318aab8cd (patch) | |
| tree | 66a94c28e929c527582221fe97711dab0b5ec4fa /target/linux/ixp4xx | |
| parent | ce9bbbd6ec698bddf8aaf0c6d3d1ec9a37acb105 (diff) | |
| download | master-187ad058-5be3ae8fe593fa92500391113d60f08318aab8cd.tar.gz master-187ad058-5be3ae8fe593fa92500391113d60f08318aab8cd.tar.bz2 master-187ad058-5be3ae8fe593fa92500391113d60f08318aab8cd.zip | |
refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27492 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx')
3 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.37/193-cambria_pld_gpio.patch b/target/linux/ixp4xx/patches-2.6.37/193-cambria_pld_gpio.patch index 299630f171..171898d6c7 100644 --- a/target/linux/ixp4xx/patches-2.6.37/193-cambria_pld_gpio.patch +++ b/target/linux/ixp4xx/patches-2.6.37/193-cambria_pld_gpio.patch @@ -90,7 +90,7 @@ } static struct cambria_board_info cambria_boards[] __initdata = { -@@ -460,6 +507,14 @@ static struct i2c_board_info __initdata +@@ -460,6 +507,14 @@ static struct i2c_board_info __initdata I2C_BOARD_INFO("24c08", 0x51), .platform_data = &cambria_eeprom_info }, diff --git a/target/linux/ixp4xx/patches-2.6.38/191-cambria_optional_uart.patch b/target/linux/ixp4xx/patches-2.6.38/191-cambria_optional_uart.patch index 639e19e4dc..4340747ea5 100644 --- a/target/linux/ixp4xx/patches-2.6.38/191-cambria_optional_uart.patch +++ b/target/linux/ixp4xx/patches-2.6.38/191-cambria_optional_uart.patch @@ -165,7 +165,7 @@ case UPIO_AU: case UPIO_DWAPB: case UPIO_DWAPB32: -@@ -2521,6 +2541,7 @@ static int serial8250_request_std_resour +@@ -2534,6 +2554,7 @@ static int serial8250_request_std_resour case UPIO_MEM: case UPIO_DWAPB: case UPIO_DWAPB32: @@ -173,7 +173,7 @@ if (!up->port.mapbase) break; -@@ -2559,6 +2580,7 @@ static void serial8250_release_std_resou +@@ -2572,6 +2593,7 @@ static void serial8250_release_std_resou case UPIO_MEM: case UPIO_DWAPB: case UPIO_DWAPB32: @@ -181,7 +181,7 @@ if (!up->port.mapbase) break; -@@ -3074,6 +3096,7 @@ static int __devinit serial8250_probe(st +@@ -3083,6 +3105,7 @@ static int __devinit serial8250_probe(st port.set_termios = p->set_termios; port.pm = p->pm; port.dev = &dev->dev; @@ -189,7 +189,7 @@ port.irqflags |= irqflag; ret = serial8250_register_port(&port); if (ret < 0) { -@@ -3223,6 +3246,7 @@ int serial8250_register_port(struct uart +@@ -3232,6 +3255,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; diff --git a/target/linux/ixp4xx/patches-2.6.38/402-ixp4xx_gpiolib.patch b/target/linux/ixp4xx/patches-2.6.38/402-ixp4xx_gpiolib.patch index 61a3112439..7c20071ed5 100644 --- a/target/linux/ixp4xx/patches-2.6.38/402-ixp4xx_gpiolib.patch +++ b/target/linux/ixp4xx/patches-2.6.38/402-ixp4xx_gpiolib.patch @@ -61,7 +61,7 @@ --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -448,7 +448,7 @@ config ARCH_IXP4XX +@@ -447,7 +447,7 @@ config ARCH_IXP4XX bool "IXP4xx-based" depends on MMU select CPU_XSCALE |