diff options
| author | Miklos Szeredi <mszeredi@suse.cz> | 2008-07-03 20:56:05 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-07-14 15:03:04 +1000 |
| commit | 5915eb53861c5776cfec33ca4fcc1fd20d66dd27 (patch) | |
| tree | d4895b96dfdc227a3abe2f13c093b6f53ac3aef8 /security/Makefile | |
| parent | b478a9f9889c81e88077d1495daadee64c0af541 (diff) | |
| download | kernel_samsung_smdk4412-5915eb53861c5776cfec33ca4fcc1fd20d66dd27.zip kernel_samsung_smdk4412-5915eb53861c5776cfec33ca4fcc1fd20d66dd27.tar.gz kernel_samsung_smdk4412-5915eb53861c5776cfec33ca4fcc1fd20d66dd27.tar.bz2 | |
security: remove dummy module
Remove the dummy module and make the "capability" module the default.
Compile and boot tested.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Acked-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/Makefile')
| -rw-r--r-- | security/Makefile | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/security/Makefile b/security/Makefile index 7ef1107..f654260 100644 --- a/security/Makefile +++ b/security/Makefile @@ -6,16 +6,13 @@ obj-$(CONFIG_KEYS) += keys/ subdir-$(CONFIG_SECURITY_SELINUX) += selinux subdir-$(CONFIG_SECURITY_SMACK) += smack -# if we don't select a security model, use the default capabilities -ifneq ($(CONFIG_SECURITY),y) +# always enable default capabilities obj-y += commoncap.o -endif # Object file lists -obj-$(CONFIG_SECURITY) += security.o dummy.o inode.o +obj-$(CONFIG_SECURITY) += security.o capability.o inode.o # Must precede capability.o in order to stack properly. obj-$(CONFIG_SECURITY_SELINUX) += selinux/built-in.o -obj-$(CONFIG_SECURITY_SMACK) += commoncap.o smack/built-in.o -obj-$(CONFIG_SECURITY_CAPABILITIES) += commoncap.o capability.o -obj-$(CONFIG_SECURITY_ROOTPLUG) += commoncap.o root_plug.o +obj-$(CONFIG_SECURITY_SMACK) += smack/built-in.o +obj-$(CONFIG_SECURITY_ROOTPLUG) += root_plug.o obj-$(CONFIG_CGROUP_DEVICE) += device_cgroup.o |