amazon: Upgrade amazon target to kernel 2.6.37

[openwrt/svn-archive/archive.git] / target / linux / amazon / patches-2.6.32 / 160-cfi-swap.patch

diff --git a/target/linux/amazon/patches-2.6.32/160-cfi-swap.patch b/target/linux/amazon/patches-2.6.32/160-cfi-swap.patch
index bb89f6110de2a9e70e1e6836f3b53d7bcd7464d4..48b84f4c03a8a6653d7e6bcb00df6011a0a09c3e 100644 (file)
--- a/target/linux/amazon/patches-2.6.32/160-cfi-swap.patch
+++ b/target/linux/amazon/patches-2.6.32/160-cfi-swap.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -1079,6 +1079,9 @@ static int __xipram do_write_oneword(str
+@@ -1107,6 +1107,9 @@ static int __xipram do_write_oneword(str
        int retry_cnt = 0;
  
        adr += chip->start;
@@ -10,7 +10,7 @@
  
        spin_lock(chip->mutex);
        ret = get_chip(map, chip, adr, FL_WRITING);
-@@ -1361,7 +1364,11 @@ static int __xipram do_write_buffer(stru
+@@ -1389,7 +1392,11 @@ static int __xipram do_write_buffer(stru
        z = 0;
        while(z < words * map_bankwidth(map)) {
                datum = map_word_load(map, buf);
@@ -22,7 +22,7 @@
  
                z += map_bankwidth(map);
                buf += map_bankwidth(map);
-@@ -1606,6 +1613,9 @@ static int __xipram do_erase_oneblock(st
+@@ -1634,6 +1641,9 @@ static int __xipram do_erase_oneblock(st
        int ret = 0;
  
        adr += chip->start;
@@ -32,7 +32,7 @@
  
        spin_lock(chip->mutex);
        ret = get_chip(map, chip, adr, FL_ERASING);
-@@ -1734,6 +1744,10 @@ static int do_atmel_lock(struct map_info
+@@ -1762,6 +1772,10 @@ static int do_atmel_lock(struct map_info
        struct cfi_private *cfi = map->fldrv_priv;
        int ret;
  
@@ -43,7 +43,7 @@
        spin_lock(chip->mutex);
        ret = get_chip(map, chip, adr + chip->start, FL_LOCKING);
        if (ret)
-@@ -1770,6 +1784,10 @@ static int do_atmel_unlock(struct map_in
+@@ -1798,6 +1812,10 @@ static int do_atmel_unlock(struct map_in
        struct cfi_private *cfi = map->fldrv_priv;
        int ret;