diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-08-03 08:08:23 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-08-03 08:08:23 +0200 |
commit | 94b1e5a321180a9140557642f63383a09d7c9ce5 (patch) | |
tree | 4db547184fda66a2da758c7a86a079ce16782ab6 /lib | |
parent | 7a51da5ff1e2b2c9397d781d04d0165371e80c6c (diff) | |
parent | e844f9c60d1e13f28bdb1ed95102df1e6df44faa (diff) | |
download | barebox-94b1e5a321180a9140557642f63383a09d7c9ce5.tar.gz barebox-94b1e5a321180a9140557642f63383a09d7c9ce5.tar.xz |
Merge branch 'for-next/nv'
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Kconfig | 3 | ||||
-rw-r--r-- | lib/Makefile | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/Kconfig b/lib/Kconfig index d5f99ae2e5..f9f25bdef8 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -39,6 +39,9 @@ config BCH config BITREV bool +config FNMATCH + bool + config QSORT bool diff --git a/lib/Makefile b/lib/Makefile index 92404fd331..1be1742499 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -27,7 +27,7 @@ obj-$(CONFIG_ZLIB) += decompress_inflate.o zlib_inflate/ obj-$(CONFIG_XZ_DECOMPRESS) += decompress_unxz.o xz/ obj-$(CONFIG_CMDLINE_EDITING) += readline.o obj-$(CONFIG_SIMPLE_READLINE) += readline_simple.o -obj-$(CONFIG_GLOB) += fnmatch.o +obj-$(CONFIG_FNMATCH) += fnmatch.o obj-$(CONFIG_GENERIC_FIND_NEXT_BIT) += find_next_bit.o obj-y += glob.o obj-y += notifier.o |