Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

[mirror_ubuntu-artful-kernel.git] / ipc / Makefile

diff --git a/ipc/Makefile b/ipc/Makefile
index b93bba6652f1e7abc068d96ea3490e9491939684..4e1955ea815dc5ff80c887e17b626e1ccac213e2 100644 (file)
--- a/ipc/Makefile
+++ b/ipc/Makefile
@@ -3,8 +3,10 @@
 #
 
 obj-$(CONFIG_SYSVIPC_COMPAT) += compat.o
-obj-$(CONFIG_SYSVIPC) += util.o msgutil.o msg.o sem.o shm.o
+obj-$(CONFIG_SYSVIPC) += util.o msgutil.o msg.o sem.o shm.o ipcns_notifier.o
 obj-$(CONFIG_SYSVIPC_SYSCTL) += ipc_sysctl.o
 obj_mq-$(CONFIG_COMPAT) += compat_mq.o
 obj-$(CONFIG_POSIX_MQUEUE) += mqueue.o msgutil.o $(obj_mq-y)
+obj-$(CONFIG_IPC_NS) += namespace.o
+obj-$(CONFIG_POSIX_MQUEUE_SYSCTL) += mq_sysctl.o