From: Huang, Tao <huangtao@rock-chips.com>
Date: Mon, 17 Apr 2017 03:14:57 +0000 (+0800)
Subject: ARM: rockchip_defconfig: update by savedefconfig
X-Git-Tag: firefly_0821_release~12
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=8fe5cad7740611170de8bf54afbc14bb341bcb4c;p=firefly-linux-kernel-4.4.55.git

ARM: rockchip_defconfig: update by savedefconfig

Change-Id: I4b5ec60a8beeb014754855a4865bc7fc26f2fddd
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
---

diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig
index 8f8bf48272c2..bac70c75d44c 100644
--- a/arch/arm/configs/rockchip_defconfig
+++ b/arch/arm/configs/rockchip_defconfig
@@ -390,8 +390,8 @@ CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_ROCKCHIP_LVDS=y
 CONFIG_DRM_PANEL_SIMPLE=y
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=y
-CONFIG_MALI_MIDGARD=y
 CONFIG_MALI_DEVFREQ=y
+CONFIG_MALI_MIDGARD=y
 CONFIG_MALI_EXPERT=y
 CONFIG_MALI_PLATFORM_THIRDPARTY=y
 CONFIG_MALI_PLATFORM_THIRDPARTY_NAME="rk"
@@ -574,7 +574,6 @@ CONFIG_PM_DEVFREQ=y
 CONFIG_DEVFREQ_GOV_PERFORMANCE=y
 CONFIG_DEVFREQ_GOV_POWERSAVE=y
 CONFIG_DEVFREQ_GOV_USERSPACE=y
-CONFIG_ARM_RK3399_DMC_DEVFREQ=y
 CONFIG_PM_DEVFREQ_EVENT=y
 CONFIG_EXTCON=y
 CONFIG_IIO=y