[kernel] generic-2.6/2.6.30: refresh patches

[openwrt.git] / target / linux / ifxmips / patches / 160-cfi-swap.patch

diff --git a/target/linux/ifxmips/patches/160-cfi-swap.patch b/target/linux/ifxmips/patches/160-cfi-swap.patch
index 6ddfc7e..5c98c35 100644 (file)
--- a/target/linux/ifxmips/patches/160-cfi-swap.patch
+++ b/target/linux/ifxmips/patches/160-cfi-swap.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25/drivers/mtd/chips/cfi_cmdset_0002.c
-===================================================================
---- linux-2.6.25.orig/drivers/mtd/chips/cfi_cmdset_0002.c      2008-05-07 18:58:41.000000000 +0100
-+++ linux-2.6.25/drivers/mtd/chips/cfi_cmdset_0002.c   2008-05-07 18:58:42.000000000 +0100
-@@ -1015,7 +1015,9 @@
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
+@@ -1041,7 +1041,9 @@ static int __xipram do_write_oneword(str

        int retry_cnt = 0;
  
        adr += chip->start;
        int retry_cnt = 0;
  
        adr += chip->start;


@@ -13,4 +11,3 @@ Index: linux-2.6.25/drivers/mtd/chips/cfi_cmdset_0002.c
        spin_lock(chip->mutex);
        ret = get_chip(map, chip, adr, FL_WRITING);
        if (ret) {
        spin_lock(chip->mutex);
        ret = get_chip(map, chip, adr, FL_WRITING);
        if (ret) {

-