diff options
| author | Colin Cross <ccross@android.com> | 2010-11-02 16:21:11 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2010-11-02 16:21:11 -0700 |
| commit | 3e759e2c910e26e4a76f272e0411ebe1c88e4187 (patch) | |
| tree | 7e24c885c102c0c39e4447327757bd339e24f72a /arch/arm/configs | |
| parent | 02039465df5885728846005d3d7cb9742222c926 (diff) | |
| parent | 44da1b533e5abcca6e5fe5042443ef0e28c7c907 (diff) | |
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/tegra_defconfig | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig index 5688560c3da0..3d730a772a2b 100644 --- a/arch/arm/configs/tegra_defconfig +++ b/arch/arm/configs/tegra_defconfig @@ -674,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 # |