Merge git://git.denx.de/u-boot-fsl-qoriq

[u-boot] / fs / jffs2 / Makefile

diff --git a/fs/jffs2/Makefile b/fs/jffs2/Makefile
index 4cb0600cf9b9ad53f9f75568cc892e498c198f7d..3625d748d5721b423743879b05abdd6d85ee3f90 100644 (file)
--- a/fs/jffs2/Makefile
+++ b/fs/jffs2/Makefile
@@ -10,4 +10,5 @@ obj-y += compr_rtime.o
 obj-y += compr_rubin.o
 obj-y += compr_zlib.o
 obj-y += jffs2_1pass.o
+obj-$(CONFIG_SYS_JFFS2_SORT_FRAGMENTS) += mergesort.o
 obj-y += mini_inflate.o