atheros: refresh 2.6.33 patches

[openwrt.git] / target / linux / generic-2.4 / patches / 008-intel_flashchip_fix.patch

diff --git a/target/linux/generic-2.4/patches/008-intel_flashchip_fix.patch b/target/linux/generic-2.4/patches/008-intel_flashchip_fix.patch
index b2397f6..56cb2a4 100644 (file)
--- a/target/linux/generic-2.4/patches/008-intel_flashchip_fix.patch
+++ b/target/linux/generic-2.4/patches/008-intel_flashchip_fix.patch
@@ -1,6 +1,5 @@
-diff -urN linux.old/drivers/mtd/chips/cfi_cmdset_0001.c linux.dev/drivers/mtd/chips/cfi_cmdset_0001.c
---- linux.old/drivers/mtd/chips/cfi_cmdset_0001.c      2004-11-17 12:54:21.000000000 +0100
-+++ linux.dev/drivers/mtd/chips/cfi_cmdset_0001.c      2006-03-16 17:25:04.000000000 +0100
+--- a/drivers/mtd/chips/cfi_cmdset_0001.c
++++ b/drivers/mtd/chips/cfi_cmdset_0001.c
 @@ -28,10 +28,18 @@
  #include <linux/slab.h>
  #include <linux/delay.h>
@@ -20,7 +19,7 @@ diff -urN linux.old/drivers/mtd/chips/cfi_cmdset_0001.c linux.dev/drivers/mtd/ch
  // debugging, turns off buffer write mode #define FORCE_WORD_WRITE
  
  static int cfi_intelext_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
-@@ -45,6 +53,7 @@
+@@ -45,6 +53,7 @@ static int cfi_intelext_lock(struct mtd_
  static int cfi_intelext_unlock(struct mtd_info *mtd, loff_t ofs, size_t len);
  static int cfi_intelext_suspend (struct mtd_info *);
  static void cfi_intelext_resume (struct mtd_info *);
@@ -28,7 +27,7 @@ diff -urN linux.old/drivers/mtd/chips/cfi_cmdset_0001.c linux.dev/drivers/mtd/ch
  
  static void cfi_intelext_destroy(struct mtd_info *);
  
-@@ -288,6 +297,9 @@
+@@ -288,6 +297,9 @@ static struct mtd_info *cfi_intelext_set
        map->fldrv = &cfi_intelext_chipdrv;
        MOD_INC_USE_COUNT;
        mtd->name = map->name;
@@ -38,7 +37,7 @@ diff -urN linux.old/drivers/mtd/chips/cfi_cmdset_0001.c linux.dev/drivers/mtd/ch
        return mtd;
  
   setup_err:
-@@ -1960,10 +1972,40 @@
+@@ -1961,10 +1973,40 @@ static void cfi_intelext_resume(struct m
        }
  }
  
@@ -79,9 +78,8 @@ diff -urN linux.old/drivers/mtd/chips/cfi_cmdset_0001.c linux.dev/drivers/mtd/ch
        kfree(cfi->cmdset_priv);
        kfree(cfi->cfiq);
        kfree(cfi);
-diff -urN linux.old/include/linux/mtd/mtd.h linux.dev/include/linux/mtd/mtd.h
---- linux.old/include/linux/mtd/mtd.h  2003-08-25 13:44:44.000000000 +0200
-+++ linux.dev/include/linux/mtd/mtd.h  2006-03-16 17:00:10.000000000 +0100
+--- a/include/linux/mtd/mtd.h
++++ b/include/linux/mtd/mtd.h
 @@ -10,6 +10,7 @@
  #include <linux/version.h>
  #include <linux/types.h>
@@ -90,7 +88,7 @@ diff -urN linux.old/include/linux/mtd/mtd.h linux.dev/include/linux/mtd/mtd.h
  #include <linux/module.h>
  #include <linux/uio.h>
  
-@@ -217,6 +218,8 @@
+@@ -217,6 +218,8 @@ struct mtd_info {
        int (*suspend) (struct mtd_info *mtd);
        void (*resume) (struct mtd_info *mtd);