Merge branch 'linus' into tracing/urgent

[linux-2.6-block.git] / security / Makefile

diff --git a/security/Makefile b/security/Makefile
index 95ecc06392d73bed265e63d5a1b0f8772721f051..bb44e350c6181bac5e366ee2108d62f27754556d 100644 (file)
--- a/security/Makefile
+++ b/security/Makefile
@@ -18,7 +18,6 @@ obj-$(CONFIG_SECURITY_SELINUX)                += selinux/built-in.o
 obj-$(CONFIG_SECURITY_SMACK)           += smack/built-in.o
 obj-$(CONFIG_AUDIT)                    += lsm_audit.o
 obj-$(CONFIG_SECURITY_TOMOYO)          += tomoyo/built-in.o
-obj-$(CONFIG_SECURITY_ROOTPLUG)                += root_plug.o
 obj-$(CONFIG_CGROUP_DEVICE)            += device_cgroup.o
 
 # Object integrity file lists