diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 15:45:20 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 15:45:20 +1100 |
| commit | 85f2e058be04463349f1cf85d7c0d9f6d7492826 (patch) | |
| tree | 1008bd85e2259a18c07c5fc1421a54223d12c2fd /lib/Makefile | |
| parent | 4028d93b54ecdc17993d52ec284fe369d8d5f288 (diff) | |
| parent | 17d1061f5d87eff7d50942399414845d1f7a8a08 (diff) | |
Merge remote-tracking branch 'alacrity/linux-next'
Conflicts:
drivers/Makefile
include/linux/Kbuild
lib/Kconfig
Diffstat (limited to 'lib/Makefile')
| -rw-r--r-- | lib/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/Makefile b/lib/Makefile index b73ba01a818a..034804f579fa 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -84,6 +84,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 |