From: Huang, Tao <huangtao@rock-chips.com>
Date: Mon, 23 Mar 2015 10:14:24 +0000 (+0800)
Subject: arm64: rockchip: update rockchip_defconfig by savedefconfig
X-Git-Tag: firefly_0821_release~4158^2~300
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1c35ef9a2ecaf9b03b32501aa5593dcf5ecb80b8;p=firefly-linux-kernel-4.4.55.git

arm64: rockchip: update rockchip_defconfig by savedefconfig

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

diff --git a/arch/arm64/configs/rockchip_defconfig b/arch/arm64/configs/rockchip_defconfig
index f0a13d853bf2..4f522080dc78 100644
--- a/arch/arm64/configs/rockchip_defconfig
+++ b/arch/arm64/configs/rockchip_defconfig
@@ -391,14 +391,14 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_PWM=y
 CONFIG_FB_ROCKCHIP=y
 CONFIG_LCDC_RK3368=y
-CONFIG_ROCKCHIP_RGA=y
-CONFIG_ROCKCHIP_RGA2=y
 CONFIG_RK_TRSM=y
 CONFIG_RK31XX_LVDS=y
 CONFIG_DP_ANX6345=y
 CONFIG_RK32_DP=y
 CONFIG_RK_HDMI=y
 CONFIG_RK_TVENCODER=y
+CONFIG_ROCKCHIP_RGA=y
+CONFIG_ROCKCHIP_RGA2=y
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
@@ -537,7 +537,6 @@ CONFIG_STAGING=y
 CONFIG_ZSMALLOC=y
 CONFIG_ZRAM=y
 CONFIG_ANDROID=y
-CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_ASHMEM=y
 CONFIG_ANDROID_LOGGER=y
 CONFIG_ANDROID_TIMED_GPIO=y
@@ -564,6 +563,7 @@ CONFIG_PWM=y
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_RESET_CONTROLLER=y
 CONFIG_RK_HEADSET=y
+CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT3_FS=y