summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--common/Makefile1
-rw-r--r--lib_generic/Makefile1
-rw-r--r--lib_generic/circbuf.c (renamed from common/circbuf.c)0
3 files changed, 1 insertions, 1 deletions
diff --git a/common/Makefile b/common/Makefile
index 3781738e19..47f6a71e2e 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -29,7 +29,6 @@ AOBJS =
# core
COBJS-y += main.o
-COBJS-y += circbuf.o
COBJS-y += console.o
COBJS-y += command.o
COBJS-y += dlmalloc.o
diff --git a/lib_generic/Makefile b/lib_generic/Makefile
index 686601cc18..2ec261af4a 100644
--- 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
diff --git a/common/circbuf.c b/lib_generic/circbuf.c
index 2332c63717..2332c63717 100644
--- a/common/circbuf.c
+++ b/lib_generic/circbuf.c