diff options
| author | Len Brown <len.brown@intel.com> | 2011-01-12 04:55:28 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-01-12 04:55:28 -0500 |
| commit | 07bf280521bb06bc8e64f0b998fc391253fcb959 (patch) | |
| tree | 323f0cb360d890889eacc7344e1dd42a2fb3ef68 /include/acpi | |
| parent | 1ae5ec903f71c0ffa583ec54d17415892036ee18 (diff) | |
| parent | 53eac700b0df1fef8c957b9eedfd7f48120425e3 (diff) | |
| download | linux-07bf280521bb06bc8e64f0b998fc391253fcb959.tar.gz linux-07bf280521bb06bc8e64f0b998fc391253fcb959.tar.bz2 linux-07bf280521bb06bc8e64f0b998fc391253fcb959.zip | |
Merge branch 'power-resource' into release
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/acpi_bus.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 359ef11725a6..673a3f4d1f07 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -149,8 +149,7 @@ struct acpi_device_flags { u32 power_manageable:1; u32 performance_manageable:1; u32 wake_capable:1; /* Wakeup(_PRW) supported? */ - u32 force_power_state:1; - u32 reserved:22; + u32 reserved:23; }; /* File System */ @@ -328,8 +327,8 @@ void acpi_bus_data_handler(acpi_handle handle, void *context); acpi_status acpi_bus_get_status_handle(acpi_handle handle, unsigned long long *sta); int acpi_bus_get_status(struct acpi_device *device); -int acpi_bus_get_power(acpi_handle handle, int *state); int acpi_bus_set_power(acpi_handle handle, int state); +int acpi_bus_update_power(acpi_handle handle, int *state_p); bool acpi_bus_power_manageable(acpi_handle handle); bool acpi_bus_can_wakeup(acpi_handle handle); #ifdef CONFIG_ACPI_PROC_EVENT |