Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90200f19 authored by James Morris's avatar James Morris
Browse files

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

parents bfd33c4b 82b0b2c2
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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