From: Huang, Tao <huangtao@rock-chips.com>
Date: Fri, 2 Jun 2017 08:48:55 +0000 (+0800)
Subject: ARM: rockchip_defconfig: update by savedefconfig
X-Git-Tag: release-20171130_firefly~4^2~468
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bfaadb2ca08b758d32c943af4b392add99b55a18;p=firefly-linux-kernel-4.4.55.git

ARM: rockchip_defconfig: update by savedefconfig

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

diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig
index b07bf49ac719..c03f37635b8b 100644
--- a/arch/arm/configs/rockchip_defconfig
+++ b/arch/arm/configs/rockchip_defconfig
@@ -577,12 +577,10 @@ CONFIG_FIQ_DEBUGGER_TRUST_ZONE=y
 CONFIG_RK_CONSOLE_THREAD=y
 CONFIG_COMMON_CLK_RK808=y
 CONFIG_ROCKCHIP_IOMMU=y
-CONFIG_ROCKCHIP_CPUINFO=y
 CONFIG_ROCKCHIP_PM_DOMAINS=y
 CONFIG_ROCKCHIP_PVTM=y
 CONFIG_ROCKCHIP_SUSPEND_MODE=y
 CONFIG_PM_DEVFREQ=y
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
 CONFIG_DEVFREQ_GOV_PERFORMANCE=y
 CONFIG_DEVFREQ_GOV_POWERSAVE=y
 CONFIG_DEVFREQ_GOV_USERSPACE=y