2.6.25-rc1

 security

diff --git a/security/Makefile b/security/Makefile
index ef87df2..9e8b025 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -4,6 +4,7 @@
 
 obj-$(CONFIG_KEYS)         += keys/
 subdir-$(CONFIG_SECURITY_SELINUX)   += selinux
+subdir-$(CONFIG_SECURITY_SMACK)      += smack
 
 # if we don't select a security model, use the default capabilities
 ifneq ($(CONFIG_SECURITY),y)
@@ -14,5 +15,6 @@ endif
 obj-$(CONFIG_SECURITY)         += security.o dummy.o inode.o
 # Must precede capability.o in order to stack properly.
 obj-$(CONFIG_SECURITY_SELINUX)      += selinux/built-in.o
+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