diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2008-05-02 10:17:03 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2008-05-02 10:17:03 +0000 |
commit | 1d4db4520ab1c4e7472a48d14ec641e2ef074b6b (patch) | |
tree | b992b5d551457de6a5d6f53b37b9eec182c68c29 /target/linux/generic-2.6/patches-2.6.25/850-jffs2_erase_progress_indicator.patch | |
parent | 5c09219b13a1f3695729cc24ac7e8390859a406f (diff) | |
download | upstream-1d4db4520ab1c4e7472a48d14ec641e2ef074b6b.tar.gz upstream-1d4db4520ab1c4e7472a48d14ec641e2ef074b6b.tar.bz2 upstream-1d4db4520ab1c4e7472a48d14ec641e2ef074b6b.zip |
[kernel] update to 2.6.25.1 and refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11006 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.patch | 11 |
1 files changed, 6 insertions, 5 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 89b1ca266d..667e276377 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,7 +1,8 @@ -diff -Nur linux-2.6.24/fs/jffs2/erase.c linux-2.6.24-owrt/fs/jffs2/erase.c ---- linux-2.6.24/fs/jffs2/erase.c 2008-01-30 17:30:15.000000000 +0100 -+++ linux-2.6.24-owrt/fs/jffs2/erase.c 2008-01-30 22:20:02.000000000 +0100 -@@ -35,6 +35,8 @@ +Index: linux-2.6.25.1/fs/jffs2/erase.c +=================================================================== +--- linux-2.6.25.1.orig/fs/jffs2/erase.c ++++ linux-2.6.25.1/fs/jffs2/erase.c +@@ -35,6 +35,8 @@ static void jffs2_erase_block(struct jff { int ret; uint32_t bad_offset; @@ -10,7 +11,7 @@ diff -Nur linux-2.6.24/fs/jffs2/erase.c linux-2.6.24-owrt/fs/jffs2/erase.c #ifdef __ECOS ret = jffs2_flash_erase(c, jeb); if (!ret) { -@@ -47,6 +49,11 @@ +@@ -47,6 +49,11 @@ static void jffs2_erase_block(struct jff D1(printk(KERN_DEBUG "jffs2_erase_block(): erase block %#08x (range %#08x-%#08x)\n", jeb->offset, jeb->offset, jeb->offset + c->sector_size)); |