aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/adm5120/patches-2.6.34/101-cfi_fixup_macronix_bootloc.patch
diff options
context:
space:
mode:
authorAlexandros C. Couloumbis <alex@ozo.com>2010-04-28 09:28:13 +0000
committerAlexandros C. Couloumbis <alex@ozo.com>2010-04-28 09:28:13 +0000
commitaa12354d6e2525ec55a29dd34fa2d802b63da9dd (patch)
tree41ee67dfb71c319841928df18c3cf2c904427a8d /target/linux/adm5120/patches-2.6.34/101-cfi_fixup_macronix_bootloc.patch
parent9d2d34a234a68f1c30edaca99d291944660427d1 (diff)
downloadmaster-187ad058-aa12354d6e2525ec55a29dd34fa2d802b63da9dd.tar.gz
master-187ad058-aa12354d6e2525ec55a29dd34fa2d802b63da9dd.tar.bz2
master-187ad058-aa12354d6e2525ec55a29dd34fa2d802b63da9dd.zip
[adm5120] refresh kernel patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21218 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/adm5120/patches-2.6.34/101-cfi_fixup_macronix_bootloc.patch')
-rw-r--r--target/linux/adm5120/patches-2.6.34/101-cfi_fixup_macronix_bootloc.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/adm5120/patches-2.6.34/101-cfi_fixup_macronix_bootloc.patch b/target/linux/adm5120/patches-2.6.34/101-cfi_fixup_macronix_bootloc.patch
index ab6d221548..43459328a4 100644
--- a/target/linux/adm5120/patches-2.6.34/101-cfi_fixup_macronix_bootloc.patch
+++ b/target/linux/adm5120/patches-2.6.34/101-cfi_fixup_macronix_bootloc.patch
@@ -55,7 +55,7 @@
static struct cfi_fixup cfi_fixup_table[] = {
{ CFI_MFR_ATMEL, CFI_ID_ANY, fixup_convert_atmel_pri, NULL },
#ifdef AMD_BOOTLOC_BUG
-@@ -319,6 +360,9 @@ static struct cfi_fixup fixup_table[] =
+@@ -319,6 +360,9 @@ static struct cfi_fixup fixup_table[] =
*/
{ CFI_MFR_ANY, CFI_ID_ANY, fixup_use_erase_chip, NULL },
{ CFI_MFR_ATMEL, AT49BV6416, fixup_use_atmel_lock, NULL },
@@ -67,7 +67,7 @@
--- a/drivers/mtd/chips/Kconfig
+++ b/drivers/mtd/chips/Kconfig
-@@ -198,6 +198,14 @@ config MTD_CFI_AMDSTD
+@@ -196,6 +196,14 @@ config MTD_CFI_AMDSTD
provides support for one of those command sets, used on chips
including the AMD Am29LV320.