Merge branches 'release' and 'dock' into release

[linux-2.6] / drivers / thermal / Kconfig

diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 9b3f612..17e71d5 100644 (file)
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -4,12 +4,11 @@
 
 menuconfig THERMAL
        bool "Generic Thermal sysfs driver"
-       default y
        help
          Generic Thermal Sysfs driver offers a generic mechanism for
          thermal management. Usually it's made up of one or more thermal
          zone and cooling device.
-         each thermal zone contains its own temperature, trip points,
+         Each thermal zone contains its own temperature, trip points,
          cooling devices.
          All platforms with ACPI thermal support can use this driver.
-         If you want this support, you should say Y here
+         If you want this support, you should say Y here.