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 | a00596924bdb47bac223851e79208e4f051677f5 (patch) | |
| tree | a85a96cafeb3af548e13391a1cc12468bd13ddf2 | |
| parent | 90bd74dd8b87d84697efbd3c2624c58496783dad (diff) | |
| download | upstream-a00596924bdb47bac223851e79208e4f051677f5.tar.gz upstream-a00596924bdb47bac223851e79208e4f051677f5.tar.bz2 upstream-a00596924bdb47bac223851e79208e4f051677f5.zip | |
refresh patches
SVN-Revision: 27492
7 files changed, 14 insertions, 13 deletions
diff --git a/target/linux/generic/patches-2.6.37/442-block2mtd_probe.patch b/target/linux/generic/patches-2.6.37/442-block2mtd_probe.patch index b9130a446c..a97b74e5fd 100644 --- a/target/linux/generic/patches-2.6.37/442-block2mtd_probe.patch +++ b/target/linux/generic/patches-2.6.37/442-block2mtd_probe.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/devices/block2mtd.c +++ b/drivers/mtd/devices/block2mtd.c -@@ -264,10 +264,12 @@ static int _open_bdev(struct block2mtd_d +@@ -264,11 +264,13 @@ static int _open_bdev(struct block2mtd_d bdev = open_bdev_exclusive(dev->devname, FMODE_READ|FMODE_WRITE, NULL); #ifndef MODULE if (IS_ERR(bdev)) { @@ -9,8 +9,9 @@ /* We might not have rootfs mounted at this point. Try to resolve the device name by other means. */ -+ wait_for_device_probe(); - dev_t devt = name_to_dev_t(dev->devname); ++ wait_for_device_probe(); + devt = name_to_dev_t(dev->devname); if (devt) { bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ); + } diff --git a/target/linux/generic/patches-2.6.37/475-mtd_concat_sync_fix.patch b/target/linux/generic/patches-2.6.37/475-mtd_concat_sync_fix.patch index 4e3426b7bd..ff3759e220 100644 --- a/target/linux/generic/patches-2.6.37/475-mtd_concat_sync_fix.patch +++ b/target/linux/generic/patches-2.6.37/475-mtd_concat_sync_fix.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/mtdconcat.c +++ b/drivers/mtd/mtdconcat.c -@@ -619,7 +619,8 @@ static void concat_sync(struct mtd_info +@@ -619,7 +619,8 @@ static void concat_sync(struct mtd_info for (i = 0; i < concat->num_subdev; i++) { struct mtd_info *subdev = concat->subdev[i]; diff --git a/target/linux/generic/patches-2.6.38/260-geode-mfd.patch b/target/linux/generic/patches-2.6.38/260-geode-mfd.patch index 5f7630ffcc..a90b64ab55 100644 --- a/target/linux/generic/patches-2.6.38/260-geode-mfd.patch +++ b/target/linux/generic/patches-2.6.38/260-geode-mfd.patch @@ -1,5 +1,5 @@ ---- linux-2.6.38.8/drivers/gpio/Kconfig.orig 2011-06-02 19:35:11.000000000 -0600 -+++ linux-2.6.38.8/drivers/gpio/Kconfig 2011-06-29 20:05:20.000000000 -0600 +--- a/drivers/gpio/Kconfig ++++ b/drivers/gpio/Kconfig @@ -295,7 +295,7 @@ comment "PCI GPIO expanders:" config GPIO_CS5535 diff --git a/target/linux/generic/patches-2.6.38/261-geode-mfd2.patch b/target/linux/generic/patches-2.6.38/261-geode-mfd2.patch index 61508bd129..ffdf26902f 100644 --- a/target/linux/generic/patches-2.6.38/261-geode-mfd2.patch +++ b/target/linux/generic/patches-2.6.38/261-geode-mfd2.patch @@ -1,5 +1,5 @@ ---- linux-2.6.38.8/drivers/misc/Kconfig.orig 2011-06-02 19:35:11.000000000 -0600 -+++ linux-2.6.38.8/drivers/misc/Kconfig 2011-07-02 21:05:01.000000000 -0600 +--- a/drivers/misc/Kconfig ++++ b/drivers/misc/Kconfig @@ -224,8 +224,7 @@ config SGI_XP config CS5535_MFGPT 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 |