Merge branch 'u-boot/master' into 'u-boot-arm/master'

[oweals/u-boot.git] / lib / lzma / Makefile

diff --git a/lib/lzma/Makefile b/lib/lzma/Makefile
index 25c6797fb60a2f002c0582e298dd098d927e17f8..f8eda06c9f59849382f96838c9f7a4855fd2dbfd 100644 (file)
--- a/lib/lzma/Makefile
+++ b/lib/lzma/Makefile
@@ -10,4 +10,4 @@
 
 CFLAGS += -D_LZMA_PROB32
 
-obj-$(CONFIG_LZMA) += LzmaDec.o LzmaTools.o
+obj-y += LzmaDec.o LzmaTools.o