commit 52b6b31ccf904c550e3732e0d3ef97d3682582a4
author Linux Build Service Account <lnxbuild@localhost> Mon May 20 04:21:28 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon May 20 04:21:28 2013 -0700
tree 093cee08e1e389701488aa3c07a6b3728a4172b8
parent 89a42d5838daa41eb44c5b68aca98a56747c6e6b
parent 76a25b4f55a8fab8c9c301c283ff18b08c63f351

Merge "Defconfig: Enable Netfilter Logging"

arch/arm/configs/msm9625_defconfig

diff --git a/arch/arm/configs/msm9625_defconfig b/arch/arm/configs/msm9625_defconfig
index 2a1215d..ba246e5 100644
--- a/arch/arm/configs/msm9625_defconfig
+++ b/arch/arm/configs/msm9625_defconfig
@@ -108,12 +108,15 @@
 CONFIG_NF_CT_NETLINK=y
 CONFIG_NETFILTER_XT_MARK=y
 CONFIG_NETFILTER_XT_CONNMARK=y
+CONFIG_NETFILTER_XT_TARGET_LOG=y
+CONFIG_NETFILTER_XT_TARGET_TRACE=y
 CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y
 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
 CONFIG_NETFILTER_XT_MATCH_DSCP=y
 CONFIG_NETFILTER_XT_MATCH_ESP=y
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=y
+CONFIG_NETFILTER_XT_MATCH_LIMIT=y
 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
 CONFIG_IP_SET=y