aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-04-07 17:05:05 +0000
committerGabor Juhos <juhosg@openwrt.org>2013-04-07 17:05:05 +0000
commit1700bf5b2e0e454e4cb31b5982bd71b228ae46da (patch)
tree2e92c3192401f1328c2f3a6e8894f63489b3217e /target/linux
parent6de8743e449a358e9c412518bec76c6e37927b12 (diff)
downloadupstream-1700bf5b2e0e454e4cb31b5982bd71b228ae46da.tar.gz
upstream-1700bf5b2e0e454e4cb31b5982bd71b228ae46da.tar.bz2
upstream-1700bf5b2e0e454e4cb31b5982bd71b228ae46da.zip
ramips: refresh patches
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 36260
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/ramips/patches-3.8/0204-owrt-MIPS-ralink-add-usb-platform-support.patch2
-rw-r--r--target/linux/ramips/patches-3.8/0210-mtd_fix_cfi_cmdset_0002_erase_status_check.patch4
-rw-r--r--target/linux/ramips/patches-3.8/0211-mtd-cfi_cmdset_0002-force-word-write.patch4
3 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/ramips/patches-3.8/0204-owrt-MIPS-ralink-add-usb-platform-support.patch b/target/linux/ramips/patches-3.8/0204-owrt-MIPS-ralink-add-usb-platform-support.patch
index 4ff80e83e1..0b5b443600 100644
--- a/target/linux/ramips/patches-3.8/0204-owrt-MIPS-ralink-add-usb-platform-support.patch
+++ b/target/linux/ramips/patches-3.8/0204-owrt-MIPS-ralink-add-usb-platform-support.patch
@@ -34,7 +34,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
--- a/arch/mips/ralink/common.h
+++ b/arch/mips/ralink/common.h
-@@ -43,5 +43,6 @@ extern void prom_soc_init(struct ralink_
+@@ -46,5 +46,6 @@ extern void prom_soc_init(struct ralink_
__iomem void *plat_of_remap_node(const char *node);
void ralink_pinmux(void);
diff --git a/target/linux/ramips/patches-3.8/0210-mtd_fix_cfi_cmdset_0002_erase_status_check.patch b/target/linux/ramips/patches-3.8/0210-mtd_fix_cfi_cmdset_0002_erase_status_check.patch
index bf076fe2ec..91b887f922 100644
--- a/target/linux/ramips/patches-3.8/0210-mtd_fix_cfi_cmdset_0002_erase_status_check.patch
+++ b/target/linux/ramips/patches-3.8/0210-mtd_fix_cfi_cmdset_0002_erase_status_check.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -1927,7 +1927,7 @@ static int __xipram do_erase_chip(struct
+@@ -1939,7 +1939,7 @@ static int __xipram do_erase_chip(struct
chip->erase_suspended = 0;
}
@@ -9,7 +9,7 @@
break;
if (time_after(jiffies, timeo)) {
-@@ -2016,7 +2016,7 @@ static int __xipram do_erase_oneblock(st
+@@ -2028,7 +2028,7 @@ static int __xipram do_erase_oneblock(st
chip->erase_suspended = 0;
}
diff --git a/target/linux/ramips/patches-3.8/0211-mtd-cfi_cmdset_0002-force-word-write.patch b/target/linux/ramips/patches-3.8/0211-mtd-cfi_cmdset_0002-force-word-write.patch
index 5f9df144f9..25ae351e65 100644
--- a/target/linux/ramips/patches-3.8/0211-mtd-cfi_cmdset_0002-force-word-write.patch
+++ b/target/linux/ramips/patches-3.8/0211-mtd-cfi_cmdset_0002-force-word-write.patch
@@ -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)
-@@ -1555,7 +1560,6 @@ static int __xipram do_write_buffer(stru
+@@ -1567,7 +1572,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)
{
-@@ -1630,6 +1634,7 @@ static int cfi_amdstd_write_buffers(stru
+@@ -1642,6 +1646,7 @@ static int cfi_amdstd_write_buffers(stru
return 0;
}