summaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.25/850-jffs2_erase_progress_indicator.patch
diff options
context:
space:
mode:
authorkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-05-30 16:30:51 +0000
committerkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-05-30 16:30:51 +0000
commit48983d35d70395a391026c8f8bb1f44165ce058e (patch)
tree5e3bc42552316a5cdaf8eee331305ff7b55c7bad /target/linux/generic-2.6/patches-2.6.25/850-jffs2_erase_progress_indicator.patch
parent1854938e6ee49ce15d9d11e555f1a12a2e46a6fd (diff)
refresh generic 2.6.25 patches to match upstream style
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11296 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.25/850-jffs2_erase_progress_indicator.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/850-jffs2_erase_progress_indicator.patch10
1 files changed, 4 insertions, 6 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.25/850-jffs2_erase_progress_indicator.patch b/target/linux/generic-2.6/patches-2.6.25/850-jffs2_erase_progress_indicator.patch
index c593d0a46..2d4eafd1f 100644
--- a/target/linux/generic-2.6/patches-2.6.25/850-jffs2_erase_progress_indicator.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/850-jffs2_erase_progress_indicator.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/fs/jffs2/erase.c
-===================================================================
---- linux-2.6.25.4.orig/fs/jffs2/erase.c
-+++ linux-2.6.25.4/fs/jffs2/erase.c
-@@ -35,6 +35,8 @@ static void jffs2_erase_block(struct jff
+--- a/fs/jffs2/erase.c
++++ b/fs/jffs2/erase.c
+@@ -35,6 +35,8 @@
{
int ret;
uint32_t bad_offset;
@@ -11,7 +9,7 @@ Index: linux-2.6.25.4/fs/jffs2/erase.c
#ifdef __ECOS
ret = jffs2_flash_erase(c, jeb);
if (!ret) {
-@@ -47,6 +49,11 @@ static void jffs2_erase_block(struct jff
+@@ -47,6 +49,11 @@
D1(printk(KERN_DEBUG "jffs2_erase_block(): erase block %#08x (range %#08x-%#08x)\n",
jeb->offset, jeb->offset, jeb->offset + c->sector_size));