[kernel/2.6.38] fix gcc-4.6 set but unused warnings

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

diff --git a/target/linux/generic/patches-2.6.36/089-mtd-samsung-flash.patch b/target/linux/generic/patches-2.6.36/089-mtd-samsung-flash.patch
index 1d13d4e..bdbb325 100644 (file)
--- a/target/linux/generic/patches-2.6.36/089-mtd-samsung-flash.patch
+++ b/target/linux/generic/patches-2.6.36/089-mtd-samsung-flash.patch
@@ -1,36 +1,39 @@
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -373,9 +373,32 @@ static void cfi_fixup_major_minor(struct
+@@ -371,9 +371,34 @@ 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",
-+                     extp->MajorVersion, extp->MinorVersion);
++              extp->MajorVersion == '0') {
++                      printk("  Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c",
++                              extp->MajorVersion, extp->MinorVersion);
 +
-               extp->MajorVersion = '1';
-+              extp->MinorVersion = '0';
++                      extp->MajorVersion = '1';
++                      extp->MinorVersion = '0';
 +
-+              printk(" to %c.%c.\n",
-+                     extp->MajorVersion, extp->MinorVersion);
++                      printk(" to %c.%c.\n",
++                              extp->MajorVersion, extp->MinorVersion);
 +      }
 +
 +      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");
++              extp->MajorVersion == '3' && extp->MinorVersion == '3') {
++                      printk(KERN_NOTICE "  Newer Samsung flash detected, "
++                              "should be compatible with Amd/Fujitsu.\n");
 +
-+              printk("  Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c",
-+                     extp->MajorVersion, extp->MinorVersion);
++                      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->MinorVersion = '3';
++                      extp->MajorVersion = '1';       // set to 1.3
++                      extp->MinorVersion = '3';
 +
-+              printk(" to %c.%c.\n",
-+                     extp->MajorVersion, extp->MinorVersion);
++                      printk(" to %c.%c.\n",
++                              extp->MajorVersion, extp->MinorVersion);
 +      }
  }