From 14de53c477eefc0c4738843fb46a813409843272 Mon Sep 17 00:00:00 2001 From: Patrick Tjin <pattjin@google.com> Date: Wed, 8 Jul 2015 23:59:52 -0700 Subject: [PATCH] arm/configs: flo: add CONFIG_NF, savedefconfig BUG=22127026 Signed-off-by: Patrick Tjin <pattjin@google.com> Change-Id: Icdfe999fdc7cce78a1e8cfd91b8eaa0ad46d4381 --- arch/arm/configs/flo_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/configs/flo_defconfig b/arch/arm/configs/flo_defconfig index ddaeea2e4cec..d5924bc9b029 100644 --- a/arch/arm/configs/flo_defconfig +++ b/arch/arm/configs/flo_defconfig @@ -131,7 +131,6 @@ CONFIG_IPV6_MIP6=y CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_SUBTREES=y CONFIG_NETFILTER=y -CONFIG_NETFILTER_NETLINK_LOG=y CONFIG_NF_CONNTRACK=y CONFIG_NF_CONNTRACK_SECMARK=y CONFIG_NF_CONNTRACK_EVENTS=y @@ -154,6 +153,7 @@ CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y CONFIG_NETFILTER_XT_TARGET_LOG=y CONFIG_NETFILTER_XT_TARGET_MARK=y +CONFIG_NETFILTER_XT_TARGET_NFLOG=y CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y CONFIG_NETFILTER_XT_TARGET_SECMARK=y CONFIG_NETFILTER_XT_TARGET_TCPMSS=y @@ -242,10 +242,10 @@ CONFIG_CMA=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_UID_STAT=y -CONFIG_UID_CPUTIME=y CONFIG_PMIC8XXX_VIBRATOR=y CONFIG_QSEECOM=y CONFIG_USB_HSIC_SMSC_HUB=y +CONFIG_UID_CPUTIME=y CONFIG_SLIMPORT_ANX7808=y CONFIG_SCSI=y CONFIG_SCSI_TGT=y -- GitLab