summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuigi 'Comio' Mantellini <luigi.mantellini@idf-hit.com>2009-07-28 09:33:17 +0200
committerWolfgang Denk <wd@denx.de>2009-08-09 22:51:53 +0200
commit3f1649fb0dfb1e5c8890de154c332c394db5cdb5 (patch)
tree46436be239c47cb695ab0c4d181c5763efea0deb
parent1c6232f1e2eae87e0e36d489611eb6891dff21e1 (diff)
downloadtalos-obmc-uboot-3f1649fb0dfb1e5c8890de154c332c394db5cdb5.tar.gz
talos-obmc-uboot-3f1649fb0dfb1e5c8890de154c332c394db5cdb5.zip
Fix LZMA string.h header inclusion issue and remove unused variables.
Signed-off-by: Luigi 'Comio' Mantellini <luigi.mantellini@idf-hit.com>
-rw-r--r--lib_generic/lzma/LzmaDec.c2
-rw-r--r--lib_generic/lzma/LzmaTools.c1
-rw-r--r--lib_generic/lzma/Makefile2
3 files changed, 2 insertions, 3 deletions
diff --git a/lib_generic/lzma/LzmaDec.c b/lib_generic/lzma/LzmaDec.c
index acffb14aae..f941da27dd 100644
--- a/lib_generic/lzma/LzmaDec.c
+++ b/lib_generic/lzma/LzmaDec.c
@@ -6,7 +6,7 @@
#include <watchdog.h>
#include "LzmaDec.h"
-#include <string.h>
+#include <linux/string.h>
#define kNumTopBits 24
#define kTopValue ((UInt32)1 << kNumTopBits)
diff --git a/lib_generic/lzma/LzmaTools.c b/lib_generic/lzma/LzmaTools.c
index 88ba399c7c..408b577f17 100644
--- a/lib_generic/lzma/LzmaTools.c
+++ b/lib_generic/lzma/LzmaTools.c
@@ -61,7 +61,6 @@ int lzmaBuffToBuffDecompress (unsigned char *outStream, SizeT *uncompressedSize,
ISzAlloc g_Alloc;
SizeT outSizeFull = 0xFFFFFFFF; /* 4GBytes limit */
- SizeT inProcessed;
SizeT outProcessed;
SizeT outSize;
SizeT outSizeHigh;
diff --git a/lib_generic/lzma/Makefile b/lib_generic/lzma/Makefile
index 2916f215b0..57f03b0cd7 100644
--- a/lib_generic/lzma/Makefile
+++ b/lib_generic/lzma/Makefile
@@ -30,7 +30,7 @@ LIB = $(obj)liblzma.a
SOBJS =
-CFLAGS += -D_LZMA_PROB32 -I$(TOPDIR)/include/linux
+CFLAGS += -D_LZMA_PROB32
COBJS-$(CONFIG_LZMA) += LzmaDec.o LzmaTools.o
OpenPOWER on IntegriCloud