summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChanho Park <chanho61.park@samsung.com>2014-04-25 07:57:08 (GMT)
committerChanho Park <chanho61.park@samsung.com>2014-04-25 07:57:08 (GMT)
commit9282fc0473a1e7c6087c0156bfe80093fa7449ca (patch)
treef1261c05aebffb2a32c44133bd8ccb3620ba1544
parent404e7df75e43d0d5671665733952aff2eec61a2b (diff)
downloadlinux-3.10-9282fc0473a1e7c6087c0156bfe80093fa7449ca.zip
linux-3.10-9282fc0473a1e7c6087c0156bfe80093fa7449ca.tar.gz
linux-3.10-9282fc0473a1e7c6087c0156bfe80093fa7449ca.tar.bz2
tizen: update tizen_defconfigrefs/changes/41/20041/1
Enable SEC_COMP and misc updates Change-Id: I80e8011ded0007f88f7bea367c32d414abd47d52 Signed-off-by: Chanho Park <chanho61.park@samsung.com>
-rw-r--r--arch/arm/configs/tizen_defconfig10
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm/configs/tizen_defconfig b/arch/arm/configs/tizen_defconfig
index 37b7046..acb6fd9 100644
--- a/arch/arm/configs/tizen_defconfig
+++ b/arch/arm/configs/tizen_defconfig
@@ -109,6 +109,7 @@ CONFIG_CGROUP_DEBUG=y
CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_DEVICE=y
CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_MEMCG=y
@@ -193,6 +194,7 @@ CONFIG_HAVE_HW_BREAKPOINT=y
CONFIG_HAVE_ARCH_JUMP_LABEL=y
CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP_FILTER=y
CONFIG_HAVE_CONTEXT_TRACKING=y
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
@@ -510,7 +512,6 @@ CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_ALIGNMENT_TRAP=y
# CONFIG_UACCESS_WITH_MEMCPY is not set
CONFIG_SECCOMP=y
-CONFIG_SECCOMP_FILTER=y
# CONFIG_CC_STACKPROTECTOR is not set
# CONFIG_XEN is not set
@@ -803,6 +804,7 @@ CONFIG_NETFILTER_XT_MATCH_MARK=y
# CONFIG_NETFILTER_XT_MATCH_OSF is not set
# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
CONFIG_NETFILTER_XT_MATCH_POLICY=y
+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
CONFIG_NETFILTER_XT_MATCH_QUOTA=y
# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
@@ -874,6 +876,7 @@ CONFIG_IP6_NF_RAW=y
CONFIG_NF_NAT_IPV6=y
CONFIG_IP6_NF_TARGET_MASQUERADE=y
CONFIG_IP6_NF_TARGET_NPT=y
+# CONFIG_BRIDGE_NF_EBTABLES is not set
# CONFIG_IP_DCCP is not set
# CONFIG_IP_SCTP is not set
# CONFIG_RDS is not set
@@ -886,6 +889,8 @@ CONFIG_BRIDGE_IGMP_SNOOPING=y
CONFIG_BRIDGE_VLAN_FILTERING=y
CONFIG_HAVE_NET_DSA=y
CONFIG_VLAN_8021Q=y
+# CONFIG_VLAN_8021Q_GVRP is not set
+# CONFIG_VLAN_8021Q_MVRP is not set
# CONFIG_DECNET is not set
CONFIG_LLC=y
# CONFIG_LLC2 is not set
@@ -1182,7 +1187,6 @@ CONFIG_UMTS_MODEM_XMM6262=y
# CONFIG_GSM_MODEM_ESC6270 is not set
# CONFIG_LINK_DEVICE_MIPI is not set
# CONFIG_LINK_DEVICE_DPRAM is not set
-# CONFIG_LINK_DEVICE_PLD is not set
# CONFIG_LINK_DEVICE_USB is not set
CONFIG_LINK_DEVICE_HSIC=y
# CONFIG_LINK_DEVICE_C2C is not set
@@ -1263,6 +1267,7 @@ CONFIG_MII=y
# CONFIG_IFB is not set
# CONFIG_NET_TEAM is not set
CONFIG_MACVLAN=y
+# CONFIG_MACVTAP is not set
# CONFIG_VXLAN is not set
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
@@ -2373,6 +2378,7 @@ CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF=y
CONFIG_SND_SOC_SMDK_WM8994_PCM=y
CONFIG_SND_SOC_TRATS=y
CONFIG_SND_SOC_SAMSUNG_EXYNOS4_WM1811=y
+# CONFIG_SND_SOC_ODROIDX2 is not set
CONFIG_SND_SOC_I2C_AND_SPI=y
# CONFIG_SND_SOC_ALL_CODECS is not set
CONFIG_SND_SOC_WM_HUBS=y