summaryrefslogtreecommitdiff
path: root/arch/arm/configs/tegra3_android_defconfig
diff options
context:
space:
mode:
authorOm Prakash Singh <omp@nvidia.com>2012-06-14 11:39:23 +0530
committerVarun Colbert <vcolbert@nvidia.com>2012-06-15 11:23:32 -0700
commitd4f98e0a7729fefb38ca459853b2f57f3bdfa862 (patch)
tree3451759ed9a6bb094e3b17264ac0a2aabc29ce80 /arch/arm/configs/tegra3_android_defconfig
parentd3090d7f097d7d0e9a707b0de76fd458e00970b5 (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/tegra3_android_defconfig')
-rw-r--r--arch/arm/configs/tegra3_android_defconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/configs/tegra3_android_defconfig b/arch/arm/configs/tegra3_android_defconfig
index af04716cc0cb..3c46da35f8b8 100644
--- a/arch/arm/configs/tegra3_android_defconfig
+++ b/arch/arm/configs/tegra3_android_defconfig
@@ -219,6 +219,7 @@ CONFIG_DM_CRYPT=y
CONFIG_DM_UEVENT=y
CONFIG_NETDEVICES=y
CONFIG_DUMMY=y
+CONFIG_TUN=y
# CONFIG_NETDEV_10000 is not set
CONFIG_BCM4329=m
CONFIG_BCM4329_FIRST_SCAN=y
@@ -315,8 +316,8 @@ CONFIG_MFD_RICOH583=y
CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
-CONFIG_REGULATOR_GPIO=y
CONFIG_REGULATOR_USERSPACE_CONSUMER=y
+CONFIG_REGULATOR_GPIO=y
CONFIG_REGULATOR_MAX8973=y
CONFIG_REGULATOR_MAX77663=y
CONFIG_REGULATOR_RC5T583=y