summaryrefslogtreecommitdiff
path: root/lib/Makefile
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-07-21 13:25:32 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2010-07-21 13:25:32 +1000
commit44bdd9307bc0d8f26287f2f462c38ebd6745282f (patch)
tree30bc52222df0e930eaa2405438b87a8ef535986a /lib/Makefile
parent68fb5ce326a07062803f9eae6ba309ea387ec326 (diff)
parent17d1061f5d87eff7d50942399414845d1f7a8a08 (diff)
Merge remote branch 'alacrity/linux-next'
Diffstat (limited to 'lib/Makefile')
-rw-r--r--lib/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/Makefile b/lib/Makefile
index 0bfabba1bb32..18e60a35623e 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -81,6 +81,8 @@ obj-$(CONFIG_TEXTSEARCH_BM) += ts_bm.o
obj-$(CONFIG_TEXTSEARCH_FSM) += ts_fsm.o
obj-$(CONFIG_SMP) += percpu_counter.o
obj-$(CONFIG_AUDIT_GENERIC) += audit.o
+obj-$(CONFIG_SHM_SIGNAL) += shm_signal.o
+obj-$(CONFIG_IOQ) += ioq.o
obj-$(CONFIG_SWIOTLB) += swiotlb.o
obj-$(CONFIG_IOMMU_HELPER) += iommu-helper.o