From 88e51034ef823ca90148b5f2d7493640eedd9e8b Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Thu, 23 Apr 2020 17:47:35 +0800 Subject: [PATCH] ARM: rockchip_defconfig: update by savedefconfig Reorder some configs. Change-Id: Ida4a95dc1862544104d576e774a2f5d4d4423594 Signed-off-by: Tao Huang --- arch/arm/configs/rockchip_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig index afb1eaf24aa0..34e39f4b0881 100644 --- a/arch/arm/configs/rockchip_defconfig +++ b/arch/arm/configs/rockchip_defconfig @@ -9,9 +9,9 @@ CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y +CONFIG_PSI=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y -CONFIG_PSI=y CONFIG_LOG_BUF_SHIFT=19 CONFIG_CGROUPS=y CONFIG_MEMCG=y @@ -620,8 +620,8 @@ CONFIG_PHY_ROCKCHIP_DP=y CONFIG_PHY_ROCKCHIP_EMMC=y CONFIG_PHY_ROCKCHIP_INNO_HDMI_PHY=y CONFIG_PHY_ROCKCHIP_INNO_USB2=y -CONFIG_PHY_ROCKCHIP_INNO_VIDEO_PHY=y CONFIG_PHY_ROCKCHIP_INNO_VIDEO_COMBO_PHY=y +CONFIG_PHY_ROCKCHIP_INNO_VIDEO_PHY=y CONFIG_PHY_ROCKCHIP_USB=y CONFIG_ANDROID=y CONFIG_ANDROID_BINDER_IPC=y