From: 黄涛 Date: Fri, 22 Aug 2014 07:26:04 +0000 (+0800) Subject: ARM: rockchip: rockchip_defconfig: update by savedefconfig X-Git-Tag: firefly_0821_release~4816 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1056406712727f87f74413eb7520d9eac772f8ad;p=firefly-linux-kernel-4.4.55.git ARM: rockchip: rockchip_defconfig: update by savedefconfig --- diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig index 051787347928..37a01f79f16b 100755 --- a/arch/arm/configs/rockchip_defconfig +++ b/arch/arm/configs/rockchip_defconfig @@ -203,7 +203,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 @@ -233,10 +232,7 @@ CONFIG_DM_UEVENT=y CONFIG_DM_VERITY=y CONFIG_NETDEVICES=y CONFIG_TUN=y -CONFIG_NET_VENDOR_ROCKCHIP=y CONFIG_RK_GMAC_ETH=y -CONFIG_GMAC_CLK_IN=y -CONFIG_PHYLIB=y CONFIG_PPP=y CONFIG_PPP_BSDCOMP=y CONFIG_PPP_DEFLATE=y