From: Huang, Tao <huangtao@rock-chips.com>
Date: Thu, 22 Sep 2016 07:07:38 +0000 (+0800)
Subject: arm64: configs: update rockchip config by savedefconfig
X-Git-Tag: firefly_0821_release~1512
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8b9c3887dc39ca501b8369f49407fd219af0bb81;p=firefly-linux-kernel-4.4.55.git

arm64: configs: update rockchip config by savedefconfig

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

diff --git a/arch/arm64/configs/rockchip_defconfig b/arch/arm64/configs/rockchip_defconfig
index 461bed3789c3..58d3a6e0acc2 100644
--- a/arch/arm64/configs/rockchip_defconfig
+++ b/arch/arm64/configs/rockchip_defconfig
@@ -212,9 +212,9 @@ CONFIG_ZRAM_LZ4_COMPRESS=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_ROCKCHIP_SCR=y
 CONFIG_SRAM=y
 CONFIG_UID_CPUTIME=y
-CONFIG_ROCKCHIP_SCR=y
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_SG=y
@@ -377,7 +377,6 @@ CONFIG_DRM_PANEL_SIMPLE=y
 CONFIG_MALI_MIDGARD=y
 CONFIG_MALI_DEVFREQ=y
 CONFIG_MALI_EXPERT=y
-CONFIG_MALI_DEBUG_SHADER_SPLIT_FS=y
 CONFIG_MALI_PLATFORM_THIRDPARTY=y
 CONFIG_MALI_PLATFORM_THIRDPARTY_NAME="rk"
 CONFIG_MALI_DEBUG=y