summaryrefslogtreecommitdiff
path: root/include/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2011-01-12 09:55:28 (GMT)
committerLen Brown <len.brown@intel.com>2011-01-12 09:55:28 (GMT)
commit07bf280521bb06bc8e64f0b998fc391253fcb959 (patch)
tree323f0cb360d890889eacc7344e1dd42a2fb3ef68 /include/acpi
parent1ae5ec903f71c0ffa583ec54d17415892036ee18 (diff)
parent53eac700b0df1fef8c957b9eedfd7f48120425e3 (diff)
downloadlinux-07bf280521bb06bc8e64f0b998fc391253fcb959.tar.xz
Merge branch 'power-resource' into release
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acpi_bus.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 359ef11..673a3f4 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