thermal: Fix merge error in Kconfig

Remove redundant entries
Add name for PID thermal governor

Change-Id: I90d4e9f4aa8a5690250dc5231ad1e98355f9bb82
Signed-off-by: Bo Yan <byan@nvidia.com>
Reviewed-on: http://git-master/r/243691
Reviewed-by: Seshendra Gadagottu <sgadagottu@nvidia.com>

diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index 2726f344c7f3c86cae994fc0057095d634662fc1..4fa86eabe8fdc0870f381d288271cd1d1fbfa715 100644 (file)
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -66,6 +66,8 @@
 #define DEFAULT_THERMAL_GOVERNOR       "user_space"
 #elif defined(CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR)
 #define DEFAULT_THERMAL_GOVERNOR       "power_allocator"
+#elif defined(CONFIG_THERMAL_DEFAULT_GOV_PID)
+#define DEFAULT_THERMAL_GOVERNOR       "pid_thermal_gov"
 #endif
 
 struct thermal_zone_device;