Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

[linux-2.6-omap-h63xx.git] / fs / jffs2 / summary.h

diff --git a/fs/jffs2/summary.h b/fs/jffs2/summary.h
index e7eb0c5814f6e1ce73b37e82e5ddfdbf4b8e0dde..6bf1f6aa45525a81f99bb8b3765e507fa9c9b65b 100644 (file)
--- a/fs/jffs2/summary.h
+++ b/fs/jffs2/summary.h
@@ -202,7 +202,7 @@ int jffs2_sum_scan_sumnode(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb
 #define jffs2_sum_add_dirent_mem(a,b,c)
 #define jffs2_sum_add_xattr_mem(a,b,c)
 #define jffs2_sum_add_xref_mem(a,b,c)
-#define jffs2_sum_scan_sumnode(a,b,c,d) (0)
+#define jffs2_sum_scan_sumnode(a,b,c,d,e) (0)
 
 #endif /* CONFIG_JFFS2_SUMMARY */