From 9d59a887bfb8b4d4c744c67d2a85f7642b4b3af4 Mon Sep 17 00:00:00 2001 From: "Huang, Tao" Date: Fri, 13 May 2016 14:20:52 +0800 Subject: [PATCH] ARM64: rockchip_defconfig: merge android config enable CONFIG_INET_DIAG_DESTROY and CONFIG_DM_VERITY_FEC Change-Id: I3bb2bbf067ebefbbcc3a102b41c7eff8879389a6 Signed-off-by: Huang, Tao --- arch/arm64/configs/rockchip_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/configs/rockchip_defconfig b/arch/arm64/configs/rockchip_defconfig index 2de8be0a07ae..cea2ab173dc2 100644 --- a/arch/arm64/configs/rockchip_defconfig +++ b/arch/arm64/configs/rockchip_defconfig @@ -85,6 +85,7 @@ CONFIG_INET_AH=y CONFIG_INET_ESP=y CONFIG_INET_IPCOMP=y # CONFIG_INET_LRO is not set +CONFIG_INET_DIAG_DESTROY=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y CONFIG_IPV6_OPTIMISTIC_DAD=y @@ -216,6 +217,7 @@ CONFIG_BLK_DEV_DM=y CONFIG_DM_CRYPT=y CONFIG_DM_UEVENT=y CONFIG_DM_VERITY=y +CONFIG_DM_VERITY_FEC=y CONFIG_NETDEVICES=y CONFIG_TUN=y # CONFIG_NET_CADENCE is not set -- 2.34.1