aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-04-08 19:47:59 +0100
committerMark Brown <broonie@linaro.org>2014-04-08 19:47:59 +0100
commit22aaeaa0ff09b993035f6b3841d9566005ba5285 (patch)
tree95c2073a2f7b4f6e76af86582ef7b7c096631ea0
parent1859631f14ffea04cd1c538262508283d1272aab (diff)
parent8f0dcaa0f92b422dadb0127d76e31b098753c8ae (diff)
downloadlinux-linaro-stable-22aaeaa0ff09b993035f6b3841d9566005ba5285.tar.gz
Merge branch 'v3.10/topic/configs' of git://git.linaro.org/kernel/linux-linaro-stable into linux-linaro-lsk
-rw-r--r--linaro/configs/android.conf1
-rw-r--r--linaro/configs/distribution.conf1
2 files changed, 2 insertions, 0 deletions
diff --git a/linaro/configs/android.conf b/linaro/configs/android.conf
index e1bf601fc57d..e4fd1ad19028 100644
--- a/linaro/configs/android.conf
+++ b/linaro/configs/android.conf
@@ -39,3 +39,4 @@ CONFIG_ADF=y
CONFIG_ADF_FBDEV=y
CONFIG_ADF_MEMBLOCK=y
CONFIG_DMA_SHARED_BUFFER=y
+CONFIG_TUN=y
diff --git a/linaro/configs/distribution.conf b/linaro/configs/distribution.conf
index fbcfed1b6ce8..a89a2e2b38a5 100644
--- a/linaro/configs/distribution.conf
+++ b/linaro/configs/distribution.conf
@@ -25,6 +25,7 @@ CONFIG_IP6_NF_MANGLE=m
CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_MARK_T=m
CONFIG_BRIDGE=m
+CONFIG_TUN=y
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
CONFIG_BLK_DEV_RAM=y