aboutsummaryrefslogtreecommitdiff
path: root/debian.master
diff options
context:
space:
mode:
authorTim Gardner <tim.gardner@canonical.com>2012-02-27 08:05:51 -0700
committerTim Gardner <tim.gardner@canonical.com>2012-03-19 11:30:03 -0600
commitc9bb9dec5188fa058a90d8d1a7959cb94e2b7929 (patch)
tree726d48536ddd915a2e73513913f6eb609ea89678 /debian.master
parentfb2c1d65a449737820554ccfc6fbc65b8e58a5f6 (diff)
UBUNTU: [Config] updateconfigs after apparmor patches
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Diffstat (limited to 'debian.master')
-rw-r--r--debian.master/config/config.common.ubuntu1
1 files changed, 0 insertions, 1 deletions
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 40c1f18643c..8d748ebcaf2 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -4581,7 +4581,6 @@ CONFIG_SECURITY=y
CONFIG_SECURITYFS=y
CONFIG_SECURITY_APPARMOR=y
CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
-CONFIG_SECURITY_APPARMOR_COMPAT_24=y
# CONFIG_SECURITY_DMESG_RESTRICT is not set
CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_NETWORK_XFRM is not set