Merge branch 'smack-for-3.20-rebased' of git://git.gitorious.org/smack-next/kernel into next

This commit is contained in:
James Morris 2015-01-29 11:01:07 +11:00
commit 90200f1916
1 changed files with 1 additions and 1 deletions

View File

@ -5,4 +5,4 @@
obj-$(CONFIG_SECURITY_SMACK) := smack.o obj-$(CONFIG_SECURITY_SMACK) := smack.o
smack-y := smack_lsm.o smack_access.o smackfs.o smack-y := smack_lsm.o smack_access.o smackfs.o
smack-$(CONFIG_NETFILTER) += smack_netfilter.o smack-$(CONFIG_SECURITY_SMACK_NETFILTER) += smack_netfilter.o