summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Konovalov <andrey.konovalov@linaro.org>2013-08-09 22:25:28 +0400
committerAndrey Konovalov <andrey.konovalov@linaro.org>2013-08-09 22:25:28 +0400
commit29bb5e8d889a2c1d26985e084e183126805e2dc2 (patch)
tree4db80cc457268d5cd38e97dcb22e51440d1ce2b0
parent29c71d01577f817e870b76d6a868494637782d06 (diff)
parent555be355c76b3207222471e6413f5551db3ee2b9 (diff)
Merge branch 'tracking-core-configs' into merge-linux-linaroll-20130809.0
-rw-r--r--linaro/configs/kvm-host.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/linaro/configs/kvm-host.conf b/linaro/configs/kvm-host.conf
index 21a40e031372..0e4c21ae44ab 100644
--- a/linaro/configs/kvm-host.conf
+++ b/linaro/configs/kvm-host.conf
@@ -9,3 +9,5 @@ CONFIG_KVM_ARM_VGIC=y
CONFIG_KVM_MMIO=y
CONFIG_KVM=y
CONFIG_BLK_DEV_NBD=m
+CONFIG_BRIDGE=y
+CONFIG_TUN=y