Merge current mainline tree into linux-omap tree

[pandora-kernel.git] / security / selinux / Makefile

diff --git a/security/selinux/Makefile b/security/selinux/Makefile
index faf2e02..d47fc5e 100644 (file)
--- a/security/selinux/Makefile
+++ b/security/selinux/Makefile
@@ -4,9 +4,19 @@
 
 obj-$(CONFIG_SECURITY_SELINUX) := selinux.o ss/
 
-selinux-y := avc.o hooks.o selinuxfs.o netlink.o nlmsgtab.o netif.o exports.o
+selinux-y := avc.o \
+            hooks.o \
+            selinuxfs.o \
+            netlink.o \
+            nlmsgtab.o \
+            netif.o \
+            netnode.o \
+            netport.o \
+            exports.o
 
 selinux-$(CONFIG_SECURITY_NETWORK_XFRM) += xfrm.o
 
+selinux-$(CONFIG_NETLABEL) += netlabel.o
+
 EXTRA_CFLAGS += -Isecurity/selinux/include