Merge commit 'v2.6.29' into x86/setup-lzma

[karo-tx-linux.git] / fs / jffs2 / compr.c

diff --git a/fs/jffs2/compr.c b/fs/jffs2/compr.c
index 86739ee53b37336c15cbc341180c47d195d9081a..f25e70c1b51c5854d987558ec5c84c0c94410b73 100644 (file)
--- a/fs/jffs2/compr.c
+++ b/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