kconfig: arm: remove duplicate definitions of SOC_MX*

[karo-tx-uboot.git] / fs / jffs2 / jffs2_private.h

diff --git a/fs/jffs2/jffs2_private.h b/fs/jffs2/jffs2_private.h
index 46ed644e4d4a6dd795ae70a639484447f660751c..06b6ca29194dd93cb0fcb3664fa674fb8711b213 100644 (file)
--- a/fs/jffs2/jffs2_private.h
+++ b/fs/jffs2/jffs2_private.h
@@ -7,12 +7,13 @@
 struct b_node {
        u32 offset;
        struct b_node *next;
+       enum { CRC_UNKNOWN = 0, CRC_OK, CRC_BAD } datacrc;
 };
 
 struct b_list {
        struct b_node *listTail;
        struct b_node *listHead;
-#ifdef CFG_JFFS2_SORT_FRAGMENTS
+#ifdef CONFIG_SYS_JFFS2_SORT_FRAGMENTS
        struct b_node *listLast;
        int (*listCompare)(struct b_node *new, struct b_node *node);
        u32 listLoops;
@@ -24,7 +25,7 @@ struct b_list {
 struct b_lists {
        struct b_list dir;
        struct b_list frag;
-
+       void *readbuf;
 };
 
 struct b_compr_info {
@@ -97,4 +98,8 @@ data_crc(struct jffs2_raw_inode *node)
        }
 }
 
+#if defined(CONFIG_SYS_JFFS2_SORT_FRAGMENTS)
+/* External merge sort. */
+int sort_list(struct b_list *list);
+#endif
 #endif /* jffs2_private.h */