Merge branch 'for-linus' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git...

[~andy/linux] / security / Makefile

diff --git a/security/Makefile b/security/Makefile
index 8bb0fe9e1ca94e68cac077196fad183975955d95..a5e502f8a05bcf9285a6924a37ad431bb55c6bb4 100644 (file)
--- a/security/Makefile
+++ b/security/Makefile
@@ -24,5 +24,5 @@ obj-$(CONFIG_SECURITY_APPARMOR)               += apparmor/built-in.o
 obj-$(CONFIG_CGROUP_DEVICE)            += device_cgroup.o
 
 # Object integrity file lists
-subdir-$(CONFIG_IMA)                   += integrity/ima
-obj-$(CONFIG_IMA)                      += integrity/ima/built-in.o
+subdir-$(CONFIG_INTEGRITY)             += integrity
+obj-$(CONFIG_INTEGRITY)                        += integrity/built-in.o