summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2013-03-01 08:53:59 -0500
committerJosh Boyer <jwboyer@redhat.com>2013-03-01 08:53:59 -0500
commitf5e36b421c636b05a9ef63763b1eff7f02587c7e (patch)
tree18c4080c4c239aadb0d6d66b071ead22aff6a6ee /config-generic
parentd0bae3101fb1b763c754bdacaf523f8bb4d86b6e (diff)
downloadkernel-f5e36b421c636b05a9ef63763b1eff7f02587c7e.tar.gz
kernel-f5e36b421c636b05a9ef63763b1eff7f02587c7e.tar.xz
kernel-f5e36b421c636b05a9ef63763b1eff7f02587c7e.zip
Linux v3.8-10206-gb0af9cd
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic7
1 files changed, 4 insertions, 3 deletions
diff --git a/config-generic b/config-generic
index b2846ad1c..941d7ebb5 100644
--- a/config-generic
+++ b/config-generic
@@ -4163,9 +4163,10 @@ CONFIG_HWMON=y
CONFIG_THERMAL_HWMON=y
# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
-CONFIG_FAIR_SHARE=y
-CONFIG_STEP_WISE=y
-# CONFIG_USER_SPACE is not set
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
+# CONFIG_THERMAL_GOV_USER_SPACE is not set
+CONFIG_THERMAL_GOV_STEP_WISE=y
+# CONFIG_THERMAL_EMULATION is not set
# CONFIG_CPU_THERMAL is not set
CONFIG_INOTIFY=y