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

Commit 0acbbee4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  dock: bay: Don't call acpi_walk_namespace() when ACPI is disabled.
  ACPI: don't walk tables if ACPI was disabled
  thermal: Create CONFIG_THERMAL_HWMON=n
parents 535e49f4 c4e6a2e6

Documentation/feature-removal-schedule.txt

+9 −0
Original line number Diff line number Diff line
@@ -312,3 +312,12 @@ When: 2.6.26 
Why:	Implementation became generic; users should now include

	linux/semaphore.h instead.

Who:	Matthew Wilcox <willy@linux.intel.com>



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



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>

drivers/acpi/bay.c

+3 −0
Original line number Diff line number Diff line
@@ -377,6 +377,9 @@ static int __init bay_init(void) 


	INIT_LIST_HEAD(&drive_bays);



	if (acpi_disabled)

		return -ENODEV;



	/* look for dockable drive bays */

	acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,

		ACPI_UINT32_MAX, find_bay, &bays, NULL);

drivers/acpi/dock.c

+3 −0
Original line number Diff line number Diff line
@@ -917,6 +917,9 @@ static int __init dock_init(void) 


	dock_station = NULL;



	if (acpi_disabled)

		return 0;



	/* look for a dock station */

	acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,

			    ACPI_UINT32_MAX, find_dock, &num, NULL);

drivers/acpi/glue.c

+3 −0
Original line number Diff line number Diff line
@@ -333,6 +333,9 @@ static int __init acpi_rtc_init(void) 
{

	struct device *dev = get_rtc_dev();



	if (acpi_disabled)

		return 0;



	if (dev) {

		rtc_wake_setup();

		rtc_info.wake_on = rtc_wake_on;

drivers/thermal/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -12,3 +12,12 @@ menuconfig THERMAL 
	  cooling devices.

	  All platforms with ACPI thermal support can use this driver.

	  If you want this support, you should say Y or M here.



config THERMAL_HWMON

	bool "Hardware monitoring support"

	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.