Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab92402a authored Jul 28, 2011 by Jean Delvare Committed by Len Brown Aug 02, 2011

thermal: hide CONFIG_THERMAL_HWMON



It's about time to revert 16d75239 ("thermal: Create
CONFIG_THERMAL_HWMON=n").  Anybody running a kernel >= 2.6.40 would also
be running a recent enough version of lm-sensors.

Actually having CONFIG_THERMAL_HWMON is pretty convenient so instead of
dropping it, we keep it but hide it.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Rene Herman <rene.herman@gmail.com>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>

parent 02f8c6ae

Documentation/feature-removal-schedule.txt

+0 −9

Original line number	Diff line number	Diff line
		@@ -310,15 +310,6 @@ Who: Ravikiran Thirumalai <kiran@scalex86.org>

		---------------------------

		What: CONFIG_THERMAL_HWMON
		When: January 2009
		Why: This option was introduced just to allow older lm-sensors userspace
		to keep working over the upgrade to 2.6.26. At the scheduled time of
		removal fixed lm-sensors (2.x or 3.x) should be readily available.
		Who: Rene Herman <rene.herman@gmail.com>

		---------------------------

		What: Code that is now under CONFIG_WIRELESS_EXT_SYSFS
		(in net/core/net-sysfs.c)
		When: After the only user (hal) has seen a release with the patches

drivers/thermal/Kconfig

+2 −6

Original line number	Diff line number	Diff line
		@@ -14,11 +14,7 @@ menuconfig THERMAL
		If you want this support, you should say Y or M here.

		config THERMAL_HWMON
		bool "Hardware monitoring support"
		bool
		depends on THERMAL
		depends on HWMON=y \|\| HWMON=THERMAL
		help
		The generic thermal sysfs driver's hardware monitoring support
		requires a 2.10.7/3.0.2 or later lm-sensors userspace.

		Say Y if your user-space is new enough.
		default y