aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Konovalov <andrey.konovalov@linaro.org>2013-05-24 02:09:04 +0400
committerAndrey Konovalov <andrey.konovalov@linaro.org>2013-05-24 02:09:04 +0400
commit4f1a63b13cde295f458d38439cfcd364b2531a71 (patch)
tree6979882179058cc9870da5caaa5794885d5c372e
parentfb825aeffaf84719228b274af0a91a110210c7fb (diff)
parent110738cdcf314361b682821a4ef51b63a7d18abd (diff)
Merge branch 'tracking-core-configs' into merge-linux-linarosamsung-linux-3.10-rc2-2013.05
-rw-r--r--linaro/configs/ubuntu-minimal.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/linaro/configs/ubuntu-minimal.conf b/linaro/configs/ubuntu-minimal.conf
index 057ad013c28..e3c0c0c6503 100644
--- a/linaro/configs/ubuntu-minimal.conf
+++ b/linaro/configs/ubuntu-minimal.conf
@@ -7,6 +7,8 @@ CONFIG_CC_STACKPROTECTOR=y
CONFIG_SYN_COOKIES=y
CONFIG_IPV6=y
CONFIG_NETLABEL=y
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP6_NF_IPTABLES=m
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
CONFIG_BLK_DEV_RAM=y