diff options
| author | Nitin Kumbhar <nkumbhar@nvidia.com> | 2010-11-11 13:42:09 +0530 |
|---|---|---|
| committer | Nitin Kumbhar <nkumbhar@nvidia.com> | 2010-11-11 13:42:09 +0530 |
| commit | 949a93f879aef1c53b8317e28e8db7258d299332 (patch) | |
| tree | baf8423f14f179d8d226bb1508bc36b4e6ef49c8 /arch/arm/configs | |
| parent | 52716f14531c3a62008fe1924cfafa05fa46173e (diff) | |
| parent | 1b7aeb98256b733251847db1750626b710d4fba1 (diff) | |
Merge branch android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36
Change-Id: I7dbc97aee0c0912baf4722a8756d228bf7dd1212
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/tegra_defconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig index 322547afac43..65b4eb5646ed 100644 --- a/arch/arm/configs/tegra_defconfig +++ b/arch/arm/configs/tegra_defconfig @@ -1432,9 +1432,9 @@ CONFIG_MFD_CORE=y CONFIG_MFD_TPS6586X=y CONFIG_REGULATOR=y # CONFIG_REGULATOR_DEBUG is not set -# CONFIG_REGULATOR_DUMMY is not set -# CONFIG_REGULATOR_FIXED_VOLTAGE is not set -# CONFIG_REGULATOR_VIRTUAL_CONSUMER 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_REGULATOR_MAX1586 is not set |