summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLily Zhang <r58066@freescale.com>2010-04-14 18:55:54 +0800
committerAlejandro Gonzalez <alex.gonzalez@digi.com>2010-05-25 11:20:24 +0200
commit2487a516df82b70531082550e277485601a4eb98 (patch)
tree2b5a797f6a2006b8bc723024873303934cd43e5f /arch
parentc436821ee799a1cb915030aad4d4f2cc0c5c45e8 (diff)
ENGR00122496 MX5: Enable CONFIG_SECURITY_FILE_CAPABILITIES
Enable the CONFIG_SECURITY_FILE_CAPABILITIES option for ChromiumOS Signed-off-by: Lily Zhang <r58066@freescale.com> Signed-off-by: Alejandro Gonzalez <alex.gonzalez@digi.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/imx5_defconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/imx5_defconfig b/arch/arm/configs/imx5_defconfig
index ce347b76bff6..b79c7568f812 100644
--- a/arch/arm/configs/imx5_defconfig
+++ b/arch/arm/configs/imx5_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.31
-# Wed Apr 14 09:50:11 2010
+# Wed Apr 14 18:55:09 2010
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
@@ -1953,7 +1953,7 @@ CONFIG_ARM_UNWIND=y
# CONFIG_KEYS is not set
# CONFIG_SECURITY is not set
# CONFIG_SECURITYFS is not set
-# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+CONFIG_SECURITY_FILE_CAPABILITIES=y
CONFIG_CRYPTO=y
#