Commit d59733c1 authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'misc' into release

parents 4697fd6f 2c907b72

drivers/acpi/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -218,10 +218,10 @@ config ACPI_PROCESSOR_AGGREGATOR 
	depends on X86

	help

	  ACPI 4.0 defines processor Aggregator, which enables OS to perform

	  specfic processor configuration and control that applies to all

	  specific processor configuration and control that applies to all

	  processors in the platform. Currently only logical processor idling

	  is defined, which is to reduce power consumption. This driver

	  support the new device.

	  supports the new device.



config ACPI_THERMAL

	tristate "Thermal Zone"

drivers/acpi/ac.c

+1 −0
Original line number Diff line number Diff line
@@ -245,6 +245,7 @@ static void acpi_ac_notify(struct acpi_device *device, u32 event) 
		acpi_bus_generate_netlink_event(device->pnp.device_class,

						  dev_name(&device->dev), event,

						  (u32) ac->state);

		acpi_notifier_call_chain(device, event, (u32) ac->state);

#ifdef CONFIG_ACPI_SYSFS_POWER

		kobject_uevent(&ac->charger.dev->kobj, KOBJ_CHANGE);

#endif

drivers/acpi/button.c

+3 −0
Original line number Diff line number Diff line
@@ -251,6 +251,9 @@ int acpi_lid_open(void) 
	acpi_status status;

	unsigned long long state;



	if (!lid_device)

		return -ENODEV;



	status = acpi_evaluate_integer(lid_device->handle, "_LID", NULL,

				       &state);

	if (ACPI_FAILURE(status))

drivers/platform/x86/fujitsu-laptop.c

+1 −1
Original line number Diff line number Diff line
@@ -944,7 +944,7 @@ static int acpi_fujitsu_hotkey_remove(struct acpi_device *device, int type) 
	struct fujitsu_hotkey_t *fujitsu_hotkey = acpi_driver_data(device);

	struct input_dev *input = fujitsu_hotkey->input;



#ifdef CONFIG_LEDS_CLASS

#if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE)

	if (fujitsu_hotkey->logolamp_registered)

		led_classdev_unregister(&logolamp_led);

CRA Git | Maintained and supported by SUSTech CRA and CCSE