Merge branch 'master' into next

[people/ms/u-boot.git] / lib_generic / Makefile

diff --git a/lib_generic/Makefile b/lib_generic/Makefile
index 7291fa3963fb2763f8558e2e3279783b3d689511..bfaf3468ef673b3d12e715d5ce94b128b703e878 100644 (file)
--- a/lib_generic/Makefile
+++ b/lib_generic/Makefile
@@ -31,6 +31,7 @@ COBJS-$(CONFIG_BZIP2) += bzlib_crctable.o
 COBJS-$(CONFIG_BZIP2) += bzlib_decompress.o
 COBJS-$(CONFIG_BZIP2) += bzlib_randtable.o
 COBJS-$(CONFIG_BZIP2) += bzlib_huffman.o
+COBJS-$(CONFIG_USB_TTY) += circbuf.o
 COBJS-y += crc16.o
 COBJS-y += crc32.o
 COBJS-y += ctype.o