aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.37/089-mtd-samsung-flash.patch
diff options
context:
space:
mode:
authorAlexandros C. Couloumbis <alex@ozo.com>2010-12-08 21:20:40 +0000
committerAlexandros C. Couloumbis <alex@ozo.com>2010-12-08 21:20:40 +0000
commitce0984ec5db9152548582ca9b6b440c0b7cc0153 (patch)
tree4f11cdcc91e884b2da407586161b51ef4f84e1d6 /target/linux/generic/patches-2.6.37/089-mtd-samsung-flash.patch
parent911c2540b012a488824dcfeffdcbedc75439cbc1 (diff)
downloadupstream-ce0984ec5db9152548582ca9b6b440c0b7cc0153.tar.gz
upstream-ce0984ec5db9152548582ca9b6b440c0b7cc0153.tar.bz2
upstream-ce0984ec5db9152548582ca9b6b440c0b7cc0153.zip
linux/generic: update & refresh 2.6.36 & 2.6.37. (closes #8324)
SVN-Revision: 24370
Diffstat (limited to 'target/linux/generic/patches-2.6.37/089-mtd-samsung-flash.patch')
-rw-r--r--target/linux/generic/patches-2.6.37/089-mtd-samsung-flash.patch12
1 files changed, 7 insertions, 5 deletions
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 e4e56a0e17..cb9f7bfaca 100644
--- 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",