diff --git a/[refs] b/[refs]
index ca0bdeaf4f1f..6563a2db74a9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6028aa01f759a1dae11e5d0e495b3dc9d2b0a47b
+refs/heads/master: faa5c2a15e14b6a4e59fcae65dec5258e723ea9f
diff --git a/trunk/fs/jffs2/compr.c b/trunk/fs/jffs2/compr.c
index 86739ee53b37..f25e70c1b51c 100644
--- a/trunk/fs/jffs2/compr.c
+++ b/trunk/fs/jffs2/compr.c
@@ -53,8 +53,8 @@ static int jffs2_is_best_compression(struct jffs2_compressor *this,
 }
 
 /* jffs2_compress:
- * @data: Pointer to uncompressed data
- * @cdata: Pointer to returned pointer to buffer for compressed data
+ * @data_in: Pointer to uncompressed data
+ * @cpage_out: Pointer to returned pointer to buffer for compressed data
  * @datalen: On entry, holds the amount of data available for compression.
  *	On exit, expected to hold the amount of data actually compressed.
  * @cdatalen: On entry, holds the amount of space available for compressed