aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.24/850-jffs2_erase_progress_indicator.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2008-05-30 17:19:24 +0000
committerImre Kaloz <kaloz@openwrt.org>2008-05-30 17:19:24 +0000
commitf6d815a2839a1dcecba7132ce8499e41fc878dfc (patch)
tree253cbe10bc6569ef56223632eed27a179e447946 /target/linux/generic-2.6/patches-2.6.24/850-jffs2_erase_progress_indicator.patch
parent41ccd65d1af59a115e5e03c995f69966ef19d66c (diff)
downloadupstream-f6d815a2839a1dcecba7132ce8499e41fc878dfc.tar.gz
upstream-f6d815a2839a1dcecba7132ce8499e41fc878dfc.tar.bz2
upstream-f6d815a2839a1dcecba7132ce8499e41fc878dfc.zip
refresh generic 2.6.24 patches to match upstream style
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11302 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.24/850-jffs2_erase_progress_indicator.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/850-jffs2_erase_progress_indicator.patch10
1 files changed, 4 insertions, 6 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.24/850-jffs2_erase_progress_indicator.patch b/target/linux/generic-2.6/patches-2.6.24/850-jffs2_erase_progress_indicator.patch
index d61ee58707..2d4eafd1f4 100644
--- a/target/linux/generic-2.6/patches-2.6.24/850-jffs2_erase_progress_indicator.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/850-jffs2_erase_progress_indicator.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.24.7/fs/jffs2/erase.c
-===================================================================
---- linux-2.6.24.7.orig/fs/jffs2/erase.c
-+++ linux-2.6.24.7/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.24.7/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));