The patch titled thermal: hide CONFIG_THERMAL_HWMON has been added to the -mm tree. Its filename is thermal-hide-config_thermal_hwmon.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: thermal: hide CONFIG_THERMAL_HWMON From: Jean Delvare <khali@xxxxxxxxxxxx> It's about time to revert 16d752397301b9 ("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@xxxxxxxxxxxx> Cc: Rene Herman <rene.herman@xxxxxxxxx> Cc: Len Brown <len.brown@xxxxxxxxx> Acked-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- Documentation/feature-removal-schedule.txt | 9 --------- drivers/thermal/Kconfig | 8 ++------ 2 files changed, 2 insertions(+), 15 deletions(-) diff -puN Documentation/feature-removal-schedule.txt~thermal-hide-config_thermal_hwmon Documentation/feature-removal-schedule.txt --- a/Documentation/feature-removal-schedule.txt~thermal-hide-config_thermal_hwmon +++ a/Documentation/feature-removal-schedule.txt @@ -310,15 +310,6 @@ Who: Ravikiran Thirumalai <kiran@scalex8 --------------------------- -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@xxxxxxxxx> - ---------------------------- - 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 diff -puN drivers/thermal/Kconfig~thermal-hide-config_thermal_hwmon drivers/thermal/Kconfig --- a/drivers/thermal/Kconfig~thermal-hide-config_thermal_hwmon +++ a/drivers/thermal/Kconfig @@ -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 _ Patches currently in -mm which might be from khali@xxxxxxxxxxxx are linux-next.patch thermal-hide-config_thermal_hwmon.patch thermal-split-hwmon-lookup-to-a-separate-function.patch thermal-make-thermal_hwmon-implementation-fully-internal.patch drivers-firmware-dmi_scanc-make-dmi_name_in_vendors-more-focused.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html