projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch develop-3.10
[firefly-linux-kernel-4.4.55.git]
/
security
/
Kconfig
diff --git
a/security/Kconfig
b/security/Kconfig
index beb86b500adffd406e65b26d0cf9abeab3891703..20a4e219f59bb1d56a0cab43378859d1eef720c5 100644
(file)
--- a/
security/Kconfig
+++ b/
security/Kconfig
@@
-122,6
+122,7
@@
source security/smack/Kconfig
source security/tomoyo/Kconfig
source security/apparmor/Kconfig
source security/yama/Kconfig
+source security/tlk_driver/Kconfig
source security/integrity/Kconfig