Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / security / Makefile

diff --git a/security/Makefile b/security/Makefile
index 2feea8d97c057894bdd92782613225da282a2148..7111cf1e0d6cd15d587745499a2d2766ee66893d 100644 (file)
--- a/security/Makefile
+++ b/security/Makefile
@@ -19,3 +19,4 @@ obj-$(CONFIG_SECURITY_SMACK)          += commoncap.o smack/built-in.o
 obj-$(CONFIG_SECURITY_CAPABILITIES)    += commoncap.o capability.o
 obj-$(CONFIG_SECURITY_ROOTPLUG)                += commoncap.o root_plug.o
 obj-$(CONFIG_SECURITY_LOWMEM)          += commoncap.o lowmem.o
+obj-$(CONFIG_CGROUP_DEVICE)            += device_cgroup.o