refresh kernel patches so that they apply cleanly

[openwrt/svn-archive/archive.git] / target / linux / generic-2.6 / patches / 007-samsung_flash.patch

diff --git a/target/linux/generic-2.6/patches/007-samsung_flash.patch b/target/linux/generic-2.6/patches/007-samsung_flash.patch
index e48fe04b0db928f0679d0ac83b5d1466cdb0f987..8c9400308158380f36ac99e0c1ad8519f561cfb7 100644 (file)
--- a/target/linux/generic-2.6/patches/007-samsung_flash.patch
+++ b/target/linux/generic-2.6/patches/007-samsung_flash.patch
@@ -1,15 +1,15 @@
-diff -urN linux-2.6.19.old/drivers/mtd/chips/cfi_cmdset_0002.c linux-2.6.19.dev/drivers/mtd/chips/cfi_cmdset_0002.c
---- linux-2.6.19.old/drivers/mtd/chips/cfi_cmdset_0002.c       2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19.dev/drivers/mtd/chips/cfi_cmdset_0002.c       2006-12-14 03:13:30.000000000 +0100
-@@ -50,6 +50,7 @@
- #define SST49LF004B           0x0060
+diff -urN linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0002.c linux-2.6.21.1.dev/drivers/mtd/chips/cfi_cmdset_0002.c
+--- linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0002.c     2007-04-27 23:49:26.000000000 +0200
++++ linux-2.6.21.1.dev/drivers/mtd/chips/cfi_cmdset_0002.c     2007-05-26 19:30:01.049193968 +0200
+@@ -51,6 +51,7 @@
+ #define SST49LF040B           0x0050
  #define SST49LF008A           0x005a
  #define AT49BV6416            0x00d6
 +#define MANUFACTURER_SAMSUNG  0x00ec
  
  static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
  static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
-@@ -293,12 +294,19 @@
+@@ -294,12 +295,19 @@
  
                if (extp->MajorVersion != '1' ||
                    (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {