aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/patches-2.6.33/111-mtd-cfi_cmdset_0002-force-word-write.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-03-03 09:40:17 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-03-03 09:40:17 +0000
commit5b788881884fe29c9cde6b8e53fa5cdfd62d6956 (patch)
tree245090bb98510f27d8a1fa6d97b0edd973793675 /target/linux/ar71xx/patches-2.6.33/111-mtd-cfi_cmdset_0002-force-word-write.patch
parent68dbd277e12f7be58835761546a1da6b4704c563 (diff)
downloadupstream-5b788881884fe29c9cde6b8e53fa5cdfd62d6956.tar.gz
upstream-5b788881884fe29c9cde6b8e53fa5cdfd62d6956.tar.bz2
upstream-5b788881884fe29c9cde6b8e53fa5cdfd62d6956.zip
ar71xx: refresh 2.6.33 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19960 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/patches-2.6.33/111-mtd-cfi_cmdset_0002-force-word-write.patch')
-rw-r--r--target/linux/ar71xx/patches-2.6.33/111-mtd-cfi_cmdset_0002-force-word-write.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ar71xx/patches-2.6.33/111-mtd-cfi_cmdset_0002-force-word-write.patch b/target/linux/ar71xx/patches-2.6.33/111-mtd-cfi_cmdset_0002-force-word-write.patch
index 4be025d870..3215a7d9d3 100644
--- a/target/linux/ar71xx/patches-2.6.33/111-mtd-cfi_cmdset_0002-force-word-write.patch
+++ b/target/linux/ar71xx/patches-2.6.33/111-mtd-cfi_cmdset_0002-force-word-write.patch
@@ -35,7 +35,7 @@
/* Atmel chips don't use the same PRI format as AMD chips */
static void fixup_convert_atmel_pri(struct mtd_info *mtd, void *param)
-@@ -1315,6 +1319,7 @@ static int cfi_amdstd_write_words(struct
+@@ -1304,6 +1308,7 @@ static int cfi_amdstd_write_words(struct
/*
* FIXME: interleaved mode not tested, and probably not supported!
*/
@@ -43,7 +43,7 @@
static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
unsigned long adr, const u_char *buf,
int len)
-@@ -1426,7 +1431,6 @@ static int __xipram do_write_buffer(stru
+@@ -1415,7 +1420,6 @@ static int __xipram do_write_buffer(stru
return ret;
}
@@ -51,7 +51,7 @@
static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len,
size_t *retlen, const u_char *buf)
{
-@@ -1505,6 +1509,7 @@ static int cfi_amdstd_write_buffers(stru
+@@ -1494,6 +1498,7 @@ static int cfi_amdstd_write_buffers(stru
return 0;
}