Skip to content

Commit

Permalink
Merge branch 'smack-for-3.20-rebased' of git://git.gitorious.org/smac…
Browse files Browse the repository at this point in the history 
…k-next/kernel into next
  • Loading branch information
James Morris committed Jan 29, 2015
2 parents bfd33c4 + 82b0b2c commit 90200f1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion security/smack/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
obj-$(CONFIG_SECURITY_SMACK) := smack.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

0 comments on commit 90200f1

Please sign in to comment.