aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/Kconfig13
-rw-r--r--lib/Makefile7
2 files changed, 18 insertions, 2 deletions
diff --git a/lib/Kconfig b/lib/Kconfig
index 03c2c24b9083..e37f061fd32a 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -98,6 +98,19 @@ config LZO_DECOMPRESS
98 tristate 98 tristate
99 99
100# 100#
101# These all provide a common interface (hence the apparent duplication with
102# ZLIB_INFLATE; DECOMPRESS_GZIP is just a wrapper.)
103#
104config DECOMPRESS_GZIP
105 tristate
106
107config DECOMPRESS_BZIP2
108 tristate
109
110config DECOMPRESS_LZMA
111 tristate
112
113#
101# Generic allocator support is selected if needed 114# Generic allocator support is selected if needed
102# 115#
103config GENERIC_ALLOCATOR 116config GENERIC_ALLOCATOR
diff --git a/lib/Makefile b/lib/Makefile
index e2a21d5a264f..d9ac5a414fa7 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -11,8 +11,7 @@ lib-y := ctype.o string.o vsprintf.o cmdline.o \
11 rbtree.o radix-tree.o dump_stack.o \ 11 rbtree.o radix-tree.o dump_stack.o \
12 idr.o int_sqrt.o extable.o prio_tree.o \ 12 idr.o int_sqrt.o extable.o prio_tree.o \
13 sha1.o irq_regs.o reciprocal_div.o argv_split.o \ 13 sha1.o irq_regs.o reciprocal_div.o argv_split.o \
14 proportions.o prio_heap.o ratelimit.o show_mem.o is_single_threaded.o \ 14 proportions.o prio_heap.o ratelimit.o show_mem.o is_single_threaded.o
15 decompress_inflate.o decompress_bunzip2.o decompress_unlzma.o
16 15
17lib-$(CONFIG_MMU) += ioremap.o 16lib-$(CONFIG_MMU) += ioremap.o
18lib-$(CONFIG_SMP) += cpumask.o 17lib-$(CONFIG_SMP) += cpumask.o
@@ -66,6 +65,10 @@ obj-$(CONFIG_REED_SOLOMON) += reed_solomon/
66obj-$(CONFIG_LZO_COMPRESS) += lzo/ 65obj-$(CONFIG_LZO_COMPRESS) += lzo/
67obj-$(CONFIG_LZO_DECOMPRESS) += lzo/ 66obj-$(CONFIG_LZO_DECOMPRESS) += lzo/
68 67
68obj-$(CONFIG_DECOMPRESS_GZIP) += decompress_inflate.o
69obj-$(CONFIG_DECOMPRESS_BZIP2) += decompress_bunzip2.o
70obj-$(CONFIG_DECOMPRESS_LZMA) += decompress_unlzma.o
71
69obj-$(CONFIG_TEXTSEARCH) += textsearch.o 72obj-$(CONFIG_TEXTSEARCH) += textsearch.o
70obj-$(CONFIG_TEXTSEARCH_KMP) += ts_kmp.o 73obj-$(CONFIG_TEXTSEARCH_KMP) += ts_kmp.o
71obj-$(CONFIG_TEXTSEARCH_BM) += ts_bm.o 74obj-$(CONFIG_TEXTSEARCH_BM) += ts_bm.o