aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.35/014-samsung_flash.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-08-08 20:00:46 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-08-08 20:00:46 +0000
commitbbc8d7180488a2135118cf4d0efeed6a1af7cbc7 (patch)
tree19c8ea0adc9bd4aaaf84fbd0961855e39d772feb /target/linux/generic/patches-2.6.35/014-samsung_flash.patch
parentf5e88e82050256c8930449e133966d9cce57926a (diff)
downloadupstream-bbc8d7180488a2135118cf4d0efeed6a1af7cbc7.tar.gz
upstream-bbc8d7180488a2135118cf4d0efeed6a1af7cbc7.tar.bz2
upstream-bbc8d7180488a2135118cf4d0efeed6a1af7cbc7.zip
[kernel] refresh 2.6.35 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22540 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.35/014-samsung_flash.patch')
-rw-r--r--target/linux/generic/patches-2.6.35/014-samsung_flash.patch6
1 files changed, 3 insertions, 3 deletions
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 1b028edd98..cd4da2c2ad 100644
--- 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
-@@ -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)
{
@@ -9,7 +9,7 @@
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;
@@ -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;
-@@ -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);