diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 06:15:23 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 13:13:31 +0200 |
| commit | 38c3b2455edea648f38d3e11baf478488fd698ed (patch) | |
| tree | a66280a235dfd3fdb5c0411f4efc64b2b98aec0c /lib/Makefile | |
| parent | 5b7b7ee5d943c6b58d9b7f974167d0105ca1b787 (diff) | |
| parent | ca22ccd7cdbb6b2bd720dd7e14280ee1efa29074 (diff) | |
| download | barebox-38c3b2455edea648f38d3e11baf478488fd698ed.tar.gz barebox-38c3b2455edea648f38d3e11baf478488fd698ed.tar.xz | |
Merge branch 'for-next/misc'
Conflicts:
lib/Makefile
Diffstat (limited to 'lib/Makefile')
| -rw-r--r-- | lib/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/Makefile b/lib/Makefile index a75653fb48..77207dc773 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -45,3 +45,4 @@ obj-y += unlink-recursive.o obj-$(CONFIG_STMP_DEVICE) += stmp-device.o obj-y += wchar.o obj-y += libfile.o +obj-y += bitmap.o |