From: Huang, Tao <huangtao@rock-chips.com>
Date: Mon, 7 Mar 2016 10:03:14 +0000 (+0800)
Subject: arm64: configs: update rockchip_defconfig by savedefconfig
X-Git-Tag: firefly_0821_release~3261
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=e440f60b33bbf35d0626e26d7f5e7ed9486c0e08;p=firefly-linux-kernel-4.4.55.git

arm64: configs: update rockchip_defconfig by savedefconfig

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

diff --git a/arch/arm64/configs/rockchip_defconfig b/arch/arm64/configs/rockchip_defconfig
index badec6bee502..548f69385314 100644
--- a/arch/arm64/configs/rockchip_defconfig
+++ b/arch/arm64/configs/rockchip_defconfig
@@ -453,8 +453,6 @@ CONFIG_USB_OTG_WAKELOCK=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DEBUG_FILES=y
 CONFIG_USB_GADGET_VBUS_DRAW=500
-CONFIG_USB20_HOST=y
-CONFIG_USB20_OTG=y
 CONFIG_USB_CONFIGFS=y
 CONFIG_USB_CONFIGFS_F_FS=y
 CONFIG_USB_CONFIGFS_F_MTP=y
@@ -463,6 +461,8 @@ CONFIG_USB_CONFIGFS_F_ACC=y
 CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y
 CONFIG_USB_CONFIGFS_UEVENT=y
 CONFIG_USB_CONFIGFS_F_MIDI=y
+CONFIG_USB20_HOST=y
+CONFIG_USB20_OTG=y
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK_MINORS=32
 # CONFIG_MMC_BLOCK_BOUNCE is not set