[kernel] refresh 2.6.35 patches

[openwrt.git] / target / linux / generic / patches-2.6.35 / 014-samsung_flash.patch

diff --git a/target/linux/generic/patches-2.6.35/014-samsung_flash.patch b/target/linux/generic/patches-2.6.35/014-samsung_flash.patch
index 1b028ed..cd4da2c 100644 (file)
--- a/target/linux/generic/patches-2.6.35/014-samsung_flash.patch
+++ b/target/linux/generic/patches-2.6.35/014-samsung_flash.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c

-@@ -372,6 +372,8 @@ static struct cfi_fixup fixup_table[] = 
+@@ -372,6 +372,8 @@ static struct cfi_fixup fixup_table[] =

  static void cfi_fixup_major_minor(struct cfi_private *cfi,
                                  struct cfi_pri_amdstd *extp)
  {
  static void cfi_fixup_major_minor(struct cfi_private *cfi,
                                  struct cfi_pri_amdstd *extp)
  {


@@ -9,7 +9,7 @@
        if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e &&
            extp->MajorVersion == '0')
                extp->MajorVersion = '1';
        if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e &&
            extp->MajorVersion == '0')
                extp->MajorVersion = '1';

-@@ -404,6 +406,9 @@ struct mtd_info *cfi_cmdset_0002(struct 
+@@ -404,6 +406,9 @@ struct mtd_info *cfi_cmdset_0002(struct

  
        mtd->reboot_notifier.notifier_call = cfi_amdstd_reboot;
  
  
        mtd->reboot_notifier.notifier_call = cfi_amdstd_reboot;
  


@@ -19,7 +19,7 @@
        if (cfi->cfi_mode==CFI_MODE_CFI){
                unsigned char bootloc;
                __u16 adr = primary?cfi->cfiq->P_ADR:cfi->cfiq->A_ADR;
        if (cfi->cfi_mode==CFI_MODE_CFI){
                unsigned char bootloc;
                __u16 adr = primary?cfi->cfiq->P_ADR:cfi->cfiq->A_ADR;

-@@ -417,16 +422,24 @@ struct mtd_info *cfi_cmdset_0002(struct 
+@@ -417,16 +422,24 @@ struct mtd_info *cfi_cmdset_0002(struct

                         */
                        cfi_fixup_major_minor(cfi, extp);
  
                         */
                        cfi_fixup_major_minor(cfi, extp);