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

90200f19 · James Morris · bfd33c4b · 82b0b2c2 · 90200f19
Commit 90200f19 authored Jan 29, 2015 by James Morris
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

security/smack/Makefile security/smack/Makefile +1 -1

No files found.
--- a/security/smack/Makefile
+++ b/security/smack/Makefile
@@ -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