Use lzo2 libraries

Switch to using the more common lzo2 libraries for LZO compression.  They
should still work with the lzo1x interfaces.

Signed-off-by: Josh Boyer <jwboyer@gmail.com>

diff --git a/Makefile b/Makefile
index d3d9c154752b4d4b348daf1ef7e76e5a71a942ae..88b666a79a4f09abedfce406cb1866554d6cc5ed 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@ $(BUILDDIR)/mkfs.jffs2: $(BUILDDIR)/crc32.o \
                        $(BUILDDIR)/compr_zlib.o \
                        $(BUILDDIR)/compr_lzo.o \
                        $(BUILDDIR)/compr.o
-       $(CC) $(LDFLAGS) -o $@ $^ -lz -llzo
+       $(CC) $(LDFLAGS) -o $@ $^ -lz -llzo2
 
 $(BUILDDIR)/flash_eraseall: $(BUILDDIR)/crc32.o $(BUILDDIR)/flash_eraseall.o
        $(CC) $(LDFLAGS) -o $@ $^

diff --git a/compr_lzo.c b/compr_lzo.c
index ef3b413dc1b17b6b579addd4424909479c3e67d9..c15fd329fad77439caae271ac1193c7078b020a7 100644 (file)
--- a/compr_lzo.c
+++ b/compr_lzo.c
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <asm/types.h>
 #include <linux/jffs2.h>
-#include <lzo1x.h>
+#include <lzo/lzo1x.h>
 #include "compr.h"
 
 extern int page_size;