diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-13 12:48:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-13 12:48:54 -0400 |
| commit | ddbf9ef385bfbef897210733abfb73cb9b94ecec (patch) | |
| tree | 64a9e965a71eef13e813a3327f8d74aa7168ee19 /security/Makefile | |
| parent | 5d54e69c68c05b162a56f9914cae72afd7e6f40a (diff) | |
| parent | 2c40579bdc2a94977fcff2521d5b53a97c33e77a (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6
Diffstat (limited to 'security/Makefile')
| -rw-r--r-- | security/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/Makefile b/security/Makefile index 197cc2f3f1ec..8cbbf2f36709 100644 --- a/security/Makefile +++ b/security/Makefile | |||
| @@ -11,7 +11,7 @@ obj-y += commoncap.o | |||
| 11 | endif | 11 | endif |
| 12 | 12 | ||
| 13 | # Object file lists | 13 | # Object file lists |
| 14 | obj-$(CONFIG_SECURITY) += security.o dummy.o | 14 | obj-$(CONFIG_SECURITY) += security.o dummy.o inode.o |
| 15 | # Must precede capability.o in order to stack properly. | 15 | # Must precede capability.o in order to stack properly. |
| 16 | obj-$(CONFIG_SECURITY_SELINUX) += selinux/built-in.o | 16 | obj-$(CONFIG_SECURITY_SELINUX) += selinux/built-in.o |
| 17 | obj-$(CONFIG_SECURITY_CAPABILITIES) += commoncap.o capability.o | 17 | obj-$(CONFIG_SECURITY_CAPABILITIES) += commoncap.o capability.o |