Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36

[firefly-linux-kernel-4.4.55.git] / arch / arm / configs / tegra_defconfig

diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index c81b6d9c9fa221de4e530ff7c9c9a00fa3dfe79d..3d730a772a2b6f65d6d0447254f4cb01ca94a227 100644 (file)
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -536,6 +536,7 @@ CONFIG_BLK_DEV_LOOP=y
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_MG_DISK is not set
 CONFIG_MISC_DEVICES=y
+# CONFIG_ANDROID_PMEM is not set
 # CONFIG_ENCLOSURE_SERVICES is not set
 # CONFIG_C2PORT is not set
 
@@ -673,7 +674,13 @@ CONFIG_SSB_POSSIBLE=y
 #
 # CONFIG_SSB is not set
 # CONFIG_MFD_SUPPORT is not set
-# CONFIG_REGULATOR is not set
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+CONFIG_REGULATOR_DUMMY=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
+# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
+# CONFIG_REGULATOR_BQ24022 is not set
 # CONFIG_MEDIA_SUPPORT is not set
 
 #