Skip to content

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

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

parents bfd33c4b 82b0b2c2
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
security/smack/Makefile
View file @ 90200f19
...@@ -5,4 +5,4 @@ ...@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7