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 22f845620580dfc7c2a5f3076c8305592f0ffbbe..811aea54399fb6e60960677345ee816a44870b8e 100644 (file)
--- a/security/Makefile
+++ b/security/Makefile
@@ -10,7 +10,8 @@ subdir-$(CONFIG_SECURITY_SMACK)               += smack
 obj-y          += commoncap.o
 
 # Object file lists
-obj-$(CONFIG_SECURITY)                 += security.o capability.o inode.o
+obj-$(CONFIG_SECURITY)                 += security.o capability.o
+obj-$(CONFIG_SECURITYFS)               += inode.o
 # Must precede capability.o in order to stack properly.
 obj-$(CONFIG_SECURITY_SELINUX)         += selinux/built-in.o
 obj-$(CONFIG_SECURITY_SMACK)           += smack/built-in.o