diff options
Diffstat (limited to 'target/linux/ar71xx/patches-2.6.36')
4 files changed, 12 insertions, 12 deletions
diff --git a/target/linux/ar71xx/patches-2.6.36/005-ar71xx_mac_driver.patch b/target/linux/ar71xx/patches-2.6.36/005-ar71xx_mac_driver.patch index 01b7a2e14..1f27e84dc 100644 --- a/target/linux/ar71xx/patches-2.6.36/005-ar71xx_mac_driver.patch +++ b/target/linux/ar71xx/patches-2.6.36/005-ar71xx_mac_driver.patch @@ -1,6 +1,6 @@ --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig -@@ -2045,6 +2045,8 @@ config ACENIC_OMIT_TIGON_I +@@ -2168,6 +2168,8 @@ config ACENIC_OMIT_TIGON_I The safe and default value for this is N. diff --git a/target/linux/ar71xx/patches-2.6.36/108-mtd_fix_cfi_cmdset_0002_status_check.patch b/target/linux/ar71xx/patches-2.6.36/108-mtd_fix_cfi_cmdset_0002_status_check.patch index ebb3b1ddf..64e52b31c 100644 --- a/target/linux/ar71xx/patches-2.6.36/108-mtd_fix_cfi_cmdset_0002_status_check.patch +++ b/target/linux/ar71xx/patches-2.6.36/108-mtd_fix_cfi_cmdset_0002_status_check.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c -@@ -1190,8 +1190,8 @@ static int __xipram do_write_oneword(str +@@ -1218,8 +1218,8 @@ static int __xipram do_write_oneword(str break; } @@ -11,7 +11,7 @@ /* Latency issues. Drop the lock, wait a while and retry */ UDELAY(map, chip, adr, 1); -@@ -1207,6 +1207,8 @@ static int __xipram do_write_oneword(str +@@ -1235,6 +1235,8 @@ static int __xipram do_write_oneword(str ret = -EIO; } @@ -20,7 +20,7 @@ xip_enable(map, chip, adr); op_done: chip->state = FL_READY; -@@ -1553,7 +1555,6 @@ static int cfi_amdstd_write_buffers(stru +@@ -1581,7 +1583,6 @@ static int cfi_amdstd_write_buffers(stru return 0; } @@ -28,7 +28,7 @@ /* * Handle devices with one erase region, that only implement * the chip erase command. -@@ -1617,8 +1618,8 @@ static int __xipram do_erase_chip(struct +@@ -1645,8 +1646,8 @@ static int __xipram do_erase_chip(struct chip->erase_suspended = 0; } @@ -39,7 +39,7 @@ if (time_after(jiffies, timeo)) { printk(KERN_WARNING "MTD %s(): software timeout\n", -@@ -1638,6 +1639,7 @@ static int __xipram do_erase_chip(struct +@@ -1666,6 +1667,7 @@ static int __xipram do_erase_chip(struct ret = -EIO; } @@ -47,7 +47,7 @@ chip->state = FL_READY; xip_enable(map, chip, adr); put_chip(map, chip, adr); -@@ -1705,9 +1707,9 @@ static int __xipram do_erase_oneblock(st +@@ -1733,9 +1735,9 @@ static int __xipram do_erase_oneblock(st chip->erase_suspended = 0; } @@ -59,7 +59,7 @@ } if (time_after(jiffies, timeo)) { -@@ -1729,6 +1731,7 @@ static int __xipram do_erase_oneblock(st +@@ -1757,6 +1759,7 @@ static int __xipram do_erase_oneblock(st ret = -EIO; } diff --git a/target/linux/ar71xx/patches-2.6.36/111-mtd-cfi_cmdset_0002-force-word-write.patch b/target/linux/ar71xx/patches-2.6.36/111-mtd-cfi_cmdset_0002-force-word-write.patch index 73800738f..969cd1aae 100644 --- a/target/linux/ar71xx/patches-2.6.36/111-mtd-cfi_cmdset_0002-force-word-write.patch +++ b/target/linux/ar71xx/patches-2.6.36/111-mtd-cfi_cmdset_0002-force-word-write.patch @@ -35,7 +35,7 @@ /* Atmel chips don't use the same PRI format as AMD chips */ static void fixup_convert_atmel_pri(struct mtd_info *mtd, void *param) -@@ -1364,6 +1368,7 @@ static int cfi_amdstd_write_words(struct +@@ -1392,6 +1396,7 @@ static int cfi_amdstd_write_words(struct /* * FIXME: interleaved mode not tested, and probably not supported! */ @@ -43,7 +43,7 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, unsigned long adr, const u_char *buf, int len) -@@ -1475,7 +1480,6 @@ static int __xipram do_write_buffer(stru +@@ -1503,7 +1508,6 @@ static int __xipram do_write_buffer(stru return ret; } @@ -51,7 +51,7 @@ static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf) { -@@ -1554,6 +1558,7 @@ static int cfi_amdstd_write_buffers(stru +@@ -1582,6 +1586,7 @@ static int cfi_amdstd_write_buffers(stru return 0; } diff --git a/target/linux/ar71xx/patches-2.6.36/400-2.6.35-fix-nand_scan_ident-options.patch b/target/linux/ar71xx/patches-2.6.36/400-2.6.35-fix-nand_scan_ident-options.patch index dfaad1e0e..696094fdd 100644 --- a/target/linux/ar71xx/patches-2.6.36/400-2.6.35-fix-nand_scan_ident-options.patch +++ b/target/linux/ar71xx/patches-2.6.36/400-2.6.35-fix-nand_scan_ident-options.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/nand/rb4xx_nand.c +++ b/drivers/mtd/nand/rb4xx_nand.c -@@ -218,7 +218,7 @@ static int __init rb4xx_nand_probe(struc +@@ -220,7 +220,7 @@ static int __init rb4xx_nand_probe(struc platform_set_drvdata(pdev, info); |