linux/generic: update & refresh 2.6.36 & 2.6.37. (closes #8324)

[openwrt/staging/yousong.git] / target / linux / generic / patches-2.6.37 / 089-mtd-samsung-flash.patch

diff --git a/target/linux/generic/patches-2.6.37/089-mtd-samsung-flash.patch b/target/linux/generic/patches-2.6.37/089-mtd-samsung-flash.patch
index e4e56a0e178047c327c270f4ce93043ad00fe954..cb9f7bfaca920368df9f974671780d0df403cd4b 100644 (file)
--- a/target/linux/generic/patches-2.6.37/089-mtd-samsung-flash.patch
+++ b/target/linux/generic/patches-2.6.37/089-mtd-samsung-flash.patch
@@ -1,12 +1,14 @@
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -394,9 +394,33 @@ static void cfi_fixup_major_minor(struct
+@@ -392,9 +392,35 @@ static struct cfi_fixup fixup_table[] =
+ static void cfi_fixup_major_minor(struct cfi_private *cfi,
+                                 struct cfi_pri_amdstd *extp)
  {
-       // manufacturers defined in include/linux/mtd/cfi.h
- 
 -      if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e &&
 -          extp->MajorVersion == '0')
 -              extp->MajorVersion = '1';
++      /* Manufacturers are defined in include/linux/mtd/cfi.h */
++
 +      if (cfi->mfr == CFI_MFR_SAMSUNG &&
 +              extp->MajorVersion == '0') {
 +                      printk("  Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c",
@@ -22,12 +24,12 @@
 +      if (cfi->mfr == CFI_MFR_SAMSUNG &&
 +              extp->MajorVersion == '3' && extp->MinorVersion == '3') {
 +                      printk(KERN_NOTICE "  Newer Samsung flash detected, "
-+                              "should be compatibile with Amd/Fujitsu.\n");
++                              "should be compatible with Amd/Fujitsu.\n");
 +
 +                      printk("  Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c",
 +                              extp->MajorVersion, extp->MinorVersion);
 +
-+                      extp->MajorVersion = '1';       // set to 1.3 (last defined version)
++                      extp->MajorVersion = '1';       // set to 1.3
 +                      extp->MinorVersion = '3';
 +
 +                      printk(" to %c.%c.\n",