ramips: refresh patches

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 36260
This commit is contained in:
Gabor Juhos 2013-04-07 17:05:05 +00:00
parent 6de8743e44
commit 1700bf5b2e
3 changed files with 5 additions and 5 deletions

View File

@ -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);

View File

@ -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;
}

View File

@ -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;
}