Merge branch 'master' into export-slabh

[mv-sheeva.git] / fs / jffs2 / compr.c

diff --git a/fs/jffs2/compr.c b/fs/jffs2/compr.c
index f25e70c1b51c5854d987558ec5c84c0c94410b73..f0294410868d4ecd93ebae7f798d65c7c0299104 100644 (file)
--- a/fs/jffs2/compr.c
+++ b/fs/jffs2/compr.c
@@ -177,7 +177,7 @@ uint16_t jffs2_compress(struct jffs2_sb_info *c, struct jffs2_inode_info *f,
                spin_unlock(&jffs2_compressor_list_lock);
                break;
        default:
-               printk(KERN_ERR "JFFS2: unknow compression mode.\n");
+               printk(KERN_ERR "JFFS2: unknown compression mode.\n");
        }
  out:
        if (ret == JFFS2_COMPR_NONE) {