diff options
| author | Bo Yan <byan@nvidia.com> | 2013-06-29 11:57:56 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 13:28:10 -0700 |
| commit | 8071040c335c3103981ea7bee506a521443959cb (patch) | |
| tree | 776f6e2c102008a89a37cf9eabbbb69b04a109fd /arch/arm/configs/tegra_bonaire_mods_defconfig | |
| parent | 687c1791b7c45e837d1fd02fc3009a7dce8dc685 (diff) | |
thermal: Fix merge error in Kconfig
Remove redundant entries
Re-generate tegra defconfigs, so THERMAL_DEFAULT_GOV_PID is not
enabled.
Change-Id: I90d4e9f4aa8a5690250dc5231ad1e98355f9bb82
Signed-off-by: Bo Yan <byan@nvidia.com>
Reviewed-on: http://git-master/r/243691
(cherry picked from commit 292191bfb89f285eb8e0d24ba59d08fcb540a0ae)
Reviewed-on: http://git-master/r/246174
Reviewed-by: Mandar Padmawar <mpadmawar@nvidia.com>
Tested-by: Mandar Padmawar <mpadmawar@nvidia.com>
Diffstat (limited to 'arch/arm/configs/tegra_bonaire_mods_defconfig')
| -rw-r--r-- | arch/arm/configs/tegra_bonaire_mods_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/tegra_bonaire_mods_defconfig b/arch/arm/configs/tegra_bonaire_mods_defconfig index 11e9ce5c1a09..53661df6badf 100644 --- a/arch/arm/configs/tegra_bonaire_mods_defconfig +++ b/arch/arm/configs/tegra_bonaire_mods_defconfig @@ -76,7 +76,7 @@ CONFIG_SERIAL_8250_CONSOLE=y CONFIG_I2C=y CONFIG_GPIO_SYSFS=y # CONFIG_HWMON is not set -CONFIG_THERMAL_DEFAULT_GOV_PID=y +CONFIG_THERMAL_GOV_PID=y CONFIG_VIDEO_OUTPUT_CONTROL=y CONFIG_FB=y # CONFIG_TEGRA_NVMAP is not set |