diff --git a/[refs] b/[refs] index 8a06741cad04..6a8e93e8d304 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d7decb213a65dea0973ed980c02dae2b1b88dbe +refs/heads/master: df43176c934f2bc01f7615a6e20a4b8e77dcdd11 diff --git a/trunk/drivers/thermal/Kconfig b/trunk/drivers/thermal/Kconfig index a86e952ed4ca..bf7c687519ef 100644 --- a/trunk/drivers/thermal/Kconfig +++ b/trunk/drivers/thermal/Kconfig @@ -15,6 +15,7 @@ menuconfig THERMAL config THERMAL_HWMON bool "Hardware monitoring support" + depends on THERMAL depends on HWMON=y || HWMON=THERMAL help The generic thermal sysfs driver's hardware monitoring support