[kernel] r16387 - dists/trunk/linux-2.6/debian/config

[Ben Hutchings]

Author: benh
Date: Sat Oct  2 22:32:39 2010
New Revision: 16387

Log:
Explicitly set CONFIG_DEFAULT_SECURITY

Modified:
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Sat Oct  2 22:20:52 2010	(r16386)
+++ dists/trunk/linux-2.6/debian/config/config	Sat Oct  2 22:32:39 2010	(r16387)
@@ -4156,6 +4156,10 @@
 # CONFIG_SECURITY_ROOTPLUG is not set
 # CONFIG_INTEL_TXT is not set
 CONFIG_LSM_MMAP_MIN_ADDR=32768
+# CONFIG_SECURITY_APPARMOR is not set
+CONFIG_DEFAULT_SECURITY_SELINUX=y
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+# CONFIG_DEFAULT_SECURITY_DAC is not set
 
 ##
 ## file: security/integrity/ima/Kconfig