aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorAlexandros C. Couloumbis <alex@ozo.com>2010-11-11 14:57:58 +0000
committerAlexandros C. Couloumbis <alex@ozo.com>2010-11-11 14:57:58 +0000
commit0b6005985889862b9e29a85a571ffd1d33d92052 (patch)
tree28c249a56e1f36ffbd9bf84f34eb010053e51798 /target/linux
parent5f9d5bcfb60d5ab5bc66ee459e524394adc5537d (diff)
downloadupstream-0b6005985889862b9e29a85a571ffd1d33d92052.tar.gz
upstream-0b6005985889862b9e29a85a571ffd1d33d92052.tar.bz2
upstream-0b6005985889862b9e29a85a571ffd1d33d92052.zip
linux/generic: fix a mistake in 2.6.37/089-mtd-samsung-flash.patch. (thank you maddes)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23957 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic/patches-2.6.37/089-mtd-samsung-flash.patch27
1 files changed, 11 insertions, 16 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 03d890ea16..9b38ee4ce6 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,28 +1,21 @@
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -394,15 +394,31 @@ static void cfi_fixup_major_minor(struct
+@@ -394,9 +394,33 @@ static void cfi_fixup_major_minor(struct
{
// manufacturers defined in include/linux/mtd/cfi.h
- if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e &&
- extp->MajorVersion == '0')
-- extp->MajorVersion = '1';
-- /*
-- * SST 38VF640x chips report major=0xFF / minor=0xFF.
-- */
-- if (cfi->mfr == CFI_MFR_SST && (cfi->id >> 4) == 0x0536) {
-- extp->MajorVersion = '1';
-- extp->MinorVersion = '0';
+ 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 = '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 &&
@@ -33,11 +26,13 @@
+ 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 (last defined version)
+ extp->MinorVersion = '3';
+
+ printk(" to %c.%c.\n",
+ extp->MajorVersion, extp->MinorVersion);
- }
- }
-
++ }
++
+ /*
+ * SST 38VF640x chips report major=0xFF / minor=0xFF.
+ */