diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-10-01 05:45:41 +0200 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-10-01 05:45:41 +0200 |
commit | 1c7da74c4aab595a994beb5fe728ebf0d0b41f59 (patch) | |
tree | 64128abdf9550ebb51d8f3ee6732d7350b9c62f2 /security/Makefile | |
parent | Merge branch 'master' into upstream (diff) | |
parent | [PATCH] SCSI: fix request flag-related build breakage (diff) | |
download | linux-1c7da74c4aab595a994beb5fe728ebf0d0b41f59.tar.xz linux-1c7da74c4aab595a994beb5fe728ebf0d0b41f59.zip |
Merge branch 'master' into upstream
Diffstat (limited to 'security/Makefile')
-rw-r--r-- | security/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/security/Makefile b/security/Makefile index 8cbbf2f36709..ef87df2f50a4 100644 --- a/security/Makefile +++ b/security/Makefile @@ -16,4 +16,3 @@ obj-$(CONFIG_SECURITY) += security.o dummy.o inode.o obj-$(CONFIG_SECURITY_SELINUX) += selinux/built-in.o obj-$(CONFIG_SECURITY_CAPABILITIES) += commoncap.o capability.o obj-$(CONFIG_SECURITY_ROOTPLUG) += commoncap.o root_plug.o -obj-$(CONFIG_SECURITY_SECLVL) += seclvl.o |