diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-04-08 18:04:48 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-04-08 18:04:52 +0200 |
commit | 280ff388b1b7a818a64af4c789299e62c0d3c094 (patch) | |
tree | d63877375029eb895131a37d2eeeac306cc6c7f0 /ipc/Makefile | |
parent | c5da9a2bb24a7928c39495cdabf98d3f7931bde5 (diff) | |
parent | 577c9c456f0e1371cbade38eaf91ae8e8a308555 (diff) |
Merge commit 'v2.6.30-rc1' into x86/urgent
Merge reason: fix to be queued up depends on upstream facilities
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'ipc/Makefile')
-rw-r--r-- | ipc/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ipc/Makefile b/ipc/Makefile index 65c38439580..4e1955ea815 100644 --- a/ipc/Makefile +++ b/ipc/Makefile @@ -8,4 +8,5 @@ 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 |