diff options
| author | James Morris <james.l.morris@oracle.com> | 2015-01-28 19:01:07 -0500 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2015-01-28 19:01:07 -0500 |
| commit | 90200f19160734feceb92a3a054864c340242699 (patch) | |
| tree | 01972a3ad03a473be2410af64c2a471d5931f135 | |
| parent | bfd33c4b4b1ac718d481efee10f3a16d88757577 (diff) | |
| parent | 82b0b2c2b1e64ad6c5309a9eeba806af9812666b (diff) | |
Merge branch 'smack-for-3.20-rebased' of git://git.gitorious.org/smack-next/kernel into next
| -rw-r--r-- | security/smack/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/smack/Makefile b/security/smack/Makefile index 616cf93b368e..ee2ebd504541 100644 --- a/security/smack/Makefile +++ b/security/smack/Makefile | |||
| @@ -5,4 +5,4 @@ | |||
| 5 | obj-$(CONFIG_SECURITY_SMACK) := smack.o | 5 | obj-$(CONFIG_SECURITY_SMACK) := smack.o |
| 6 | 6 | ||
| 7 | smack-y := smack_lsm.o smack_access.o smackfs.o | 7 | smack-y := smack_lsm.o smack_access.o smackfs.o |
| 8 | smack-$(CONFIG_NETFILTER) += smack_netfilter.o | 8 | smack-$(CONFIG_SECURITY_SMACK_NETFILTER) += smack_netfilter.o |