arm64: rockchip_defconfig: update by savedefconfig
authorHuang, Tao <huangtao@rock-chips.com>
Sat, 6 May 2017 06:17:39 +0000 (14:17 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Sat, 6 May 2017 06:17:39 +0000 (14:17 +0800)
Change-Id: I4aa6538762060d62da3da56065abee4d42134da2
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
arch/arm64/configs/rockchip_defconfig

index ad3897a1e3f3235de0d889088aa19ae4c15e554e..a3cce9a66747c0d3bc8c0a0e6cc5c9d8ce295d3b 100644 (file)
@@ -495,15 +495,14 @@ CONFIG_SND_SOC=y
 CONFIG_SND_SOC_ROCKCHIP=y
 CONFIG_SND_SOC_ROCKCHIP_SPDIF=y
 CONFIG_SND_SOC_ROCKCHIP_HDMI_DP=y
-CONFIG_SND_SOC_ROCKCHIP_CDNDP=y
 CONFIG_SND_SOC_ROCKCHIP_RT5651_TC358749=y
+CONFIG_SND_SOC_ROCKCHIP_CDNDP=y
 CONFIG_SND_SOC_CX2072X=y
 CONFIG_SND_SOC_DW_HDMI_AUDIO=y
 CONFIG_SND_SOC_BT_SCO=y
 CONFIG_SND_SOC_ES8316=y
 CONFIG_SND_SOC_RK3328=y
 CONFIG_SND_SOC_RT5640=y
-CONFIG_SND_SOC_RT5651=y
 CONFIG_SND_SOC_SPDIF=y
 CONFIG_SND_SIMPLE_CARD=y
 CONFIG_HIDRAW=y
@@ -736,11 +735,11 @@ CONFIG_ENABLE_DEFAULT_TRACERS=y
 CONFIG_KEYS=y
 CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y
 CONFIG_SECURITY=y
-CONFIG_TEE_SUPPORT=y
 CONFIG_SECURITY_NETWORK=y
 CONFIG_LSM_MMAP_MIN_ADDR=4096
 CONFIG_HARDENED_USERCOPY=y
 CONFIG_SECURITY_SELINUX=y
+CONFIG_TEE_SUPPORT=y
 CONFIG_CRYPTO_ECHAINIV=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_TWOFISH=y