diff options
| -rw-r--r-- | arch/arm/configs/tegra3_android_defconfig | 3 | ||||
| -rw-r--r-- | arch/arm/configs/tegra_android_defconfig | 2 |
2 files changed, 4 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 diff --git a/arch/arm/configs/tegra_android_defconfig b/arch/arm/configs/tegra_android_defconfig index a129a8ee5a10..3d1780ca2c4e 100644 --- a/arch/arm/configs/tegra_android_defconfig +++ b/arch/arm/configs/tegra_android_defconfig @@ -200,6 +200,7 @@ CONFIG_DM_CRYPT=y CONFIG_DM_UEVENT=y CONFIG_NETDEVICES=y CONFIG_DUMMY=y +CONFIG_TUN=y CONFIG_R8169=y # CONFIG_NETDEV_10000 is not set CONFIG_BCM4329=m @@ -380,6 +381,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 |