summaryrefslogtreecommitdiffstats
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
commit4c78fa04922c0a12613b607a814397ab3071bc68 (patch)
tree7b975fba4e7d055e6c57a5d1e84a6da09c7726e4 /target/linux/adm5120/patches-2.6.34/101-cfi_fixup_macronix_bootloc.patch
parentee7569f3e5282c1cca047f55ef6bf22183cdce87 (diff)
downloadmaster-31e0f0ae-4c78fa04922c0a12613b607a814397ab3071bc68.tar.gz
master-31e0f0ae-4c78fa04922c0a12613b607a814397ab3071bc68.tar.bz2
master-31e0f0ae-4c78fa04922c0a12613b607a814397ab3071bc68.zip
refresh kernel patches
SVN-Revision: 21218
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.