Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-09 14:50:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'misc' into release

Browse Source
This commit is contained in:
Len Brown 2009-10-15 00:47:13 -04:00
commit d59733c1e5
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/acpi/Kconfig
View File

@ -218,10 +218,10 @@ config ACPI_PROCESSOR_AGGREGATOR
depends on X86 depends on X86
help help
ACPI 4.0 defines processor Aggregator, which enables OS to perform 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 processors in the platform. Currently only logical processor idling
is defined, which is to reduce power consumption. This driver is defined, which is to reduce power consumption. This driver
support the new device. supports the new device.
config ACPI_THERMAL config ACPI_THERMAL
tristate "Thermal Zone" tristate "Thermal Zone"

1
drivers/acpi/ac.c
View File

@ -245,6 +245,7 @@ static void acpi_ac_notify(struct acpi_device *device, u32 event)
acpi_bus_generate_netlink_event(device->pnp.device_class, acpi_bus_generate_netlink_event(device->pnp.device_class,
dev_name(&device->dev), event, dev_name(&device->dev), event,
(u32) ac->state); (u32) ac->state);
acpi_notifier_call_chain(device, event, (u32) ac->state);
#ifdef CONFIG_ACPI_SYSFS_POWER #ifdef CONFIG_ACPI_SYSFS_POWER
kobject_uevent(&ac->charger.dev->kobj, KOBJ_CHANGE); kobject_uevent(&ac->charger.dev->kobj, KOBJ_CHANGE);
#endif #endif

3
drivers/acpi/button.c
View File

@ -251,6 +251,9 @@ int acpi_lid_open(void)
acpi_status status; acpi_status status;
unsigned long long state; unsigned long long state;
if (!lid_device)
return -ENODEV;
status = acpi_evaluate_integer(lid_device->handle, "_LID", NULL, status = acpi_evaluate_integer(lid_device->handle, "_LID", NULL,
&state); &state);
if (ACPI_FAILURE(status)) if (ACPI_FAILURE(status))

2
drivers/platform/x86/fujitsu-laptop.c
View File

@ -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 fujitsu_hotkey_t *fujitsu_hotkey = acpi_driver_data(device);
struct input_dev *input = fujitsu_hotkey->input; 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) if (fujitsu_hotkey->logolamp_registered)
led_classdev_unregister(&logolamp_led); led_classdev_unregister(&logolamp_led);