summaryrefslogtreecommitdiff
path: root/arch/arm/configs/tegra_android_defconfig
diff options
context:
space:
mode:
authorOm Prakash Singh <omp@nvidia.com>2012-06-14 11:39:23 +0530
committerVarun Wadekar <vwadekar@nvidia.com>2012-07-12 10:12:08 +0530
commit6853edf1a35c8c734b5a4f20a602a61017304d09 (patch)
treeee9b737ff5f7482fff1a11213abb04c504d97a9a /arch/arm/configs/tegra_android_defconfig
parente9245cb2890f87e6a4581ce4f67a9665409f837a (diff)
arm: tegra: configs: enable CONFIG_TUN
Bug 997101 Signed-off-by: Om Prakash Singh <omp@nvidia.com> Change-Id: I5da0bfe342193d93e021eb9a24aacb09bf38e6a0 Reviewed-on: http://git-master/r/108780 Reviewed-by: Om Prakash Singh <omp@nvidia.com> Tested-by: Om Prakash Singh <omp@nvidia.com> Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Rakesh Kumar <krakesh@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'arch/arm/configs/tegra_android_defconfig')
-rw-r--r--arch/arm/configs/tegra_android_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/tegra_android_defconfig b/arch/arm/configs/tegra_android_defconfig
index e43637b988f8..68c27d325bd4 100644
--- a/arch/arm/configs/tegra_android_defconfig
+++ b/arch/arm/configs/tegra_android_defconfig
@@ -193,6 +193,7 @@ CONFIG_DM_CRYPT=y
CONFIG_DM_UEVENT=y
CONFIG_NETDEVICES=y
CONFIG_DUMMY=y
+CONFIG_TUN=y
CONFIG_R8169=y
CONFIG_PPP=y
CONFIG_PPP_BSDCOMP=y
@@ -368,6 +369,7 @@ CONFIG_TIMER_STATS=y
# CONFIG_DEBUG_PREEMPT is not set
CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_VM=y
+CONFIG_FUNCTION_TRACER=y
CONFIG_CRYPTO_SHA256=y
CONFIG_CRYPTO_TWOFISH=y
# CONFIG_CRYPTO_ANSI_CPRNG is not set