From: li bing <libing@rock-chips.com>
Date: Fri, 15 Aug 2014 09:26:57 +0000 (+0800)
Subject: rk3036: build together with ap6210, esp8089 and rtl8188eu driver, avoid config change.
X-Git-Tag: firefly_0821_release~4875
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c2c9654c50754890be49fa44ebdf4e1ad9ba73dd;p=firefly-linux-kernel-4.4.55.git

rk3036: build together with ap6210, esp8089 and rtl8188eu driver, avoid config change.
---

diff --git a/arch/arm/configs/rk3036_defconfig b/arch/arm/configs/rk3036_defconfig
index bbae7b3fd581..1b03e45383a2 100644
--- a/arch/arm/configs/rk3036_defconfig
+++ b/arch/arm/configs/rk3036_defconfig
@@ -34,7 +34,6 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_ARCH_ROCKCHIP=y
-CONFIG_RK_PARTITION=y
 CONFIG_BLOCK_RKNAND=y
 CONFIG_ARM_ERRATA_720789=y
 CONFIG_PL310_ERRATA_753970=y
@@ -203,7 +202,6 @@ CONFIG_BT_BNEP_PROTO_FILTER=y
 CONFIG_BT_HIDP=y
 CONFIG_BT_HCIUART=y
 CONFIG_BT_HCIUART_H4=y
-CONFIG_NL80211_TESTMODE=y
 CONFIG_CFG80211_WEXT=y
 CONFIG_RFKILL=y
 CONFIG_RFKILL_RK=y
@@ -272,6 +270,8 @@ CONFIG_USB_HSO=y
 CONFIG_USB_NET_INT51X1=y
 CONFIG_USB_IPHETH=y
 CONFIG_USB_SIERRA_NET=y
+CONFIG_RTL8188EU=y
+CONFIG_ESP8089=y
 CONFIG_RKWIFI=y
 CONFIG_AP6210=y
 # CONFIG_INPUT_MOUSEDEV is not set