summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Konovalov <andrey.konovalov@linaro.org>2013-05-28 22:36:27 +0400
committerAndrey Konovalov <andrey.konovalov@linaro.org>2013-05-28 22:36:27 +0400
commit2df7837a224311f330c99179c0fc21185d04bc85 (patch)
tree4509362aed85dfa781ce111c9810c75c3dd684f9
parent6a2cd653fc9e93fabacbb4ab3bb3ab45495fb650 (diff)
parent335bbb44a631ffd958125cee58629b7cd276671f (diff)
Merge branch 'tracking-core-configs' into merge-linux-linaro
-rw-r--r--linaro/configs/ubuntu-minimal.conf9
1 files changed, 9 insertions, 0 deletions
diff --git a/linaro/configs/ubuntu-minimal.conf b/linaro/configs/ubuntu-minimal.conf
index 057ad013c28..cb77d3995eb 100644
--- a/linaro/configs/ubuntu-minimal.conf
+++ b/linaro/configs/ubuntu-minimal.conf
@@ -7,6 +7,15 @@ CONFIG_CC_STACKPROTECTOR=y
CONFIG_SYN_COOKIES=y
CONFIG_IPV6=y
CONFIG_NETLABEL=y
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_NAT_IPV4=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_NF_NAT_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_FILTER=m
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
CONFIG_BLK_DEV_RAM=y