diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-02-23 23:15:43 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-02-23 23:15:43 +0100 |
| commit | 4383822020c54c21eb2eb939a3233b44a51e8ca0 (patch) | |
| tree | 3bfc91336f7310e3b70058db85e28833067bc661 /drivers/acpi/internal.h | |
| parent | bf900afba96bf34038bf2c944bbcad7424a40051 (diff) | |
| parent | b5d667eb392ed901fc7ae76869c7a130559e193c (diff) | |
| download | linux-3.10-4383822020c54c21eb2eb939a3233b44a51e8ca0.tar.gz linux-3.10-4383822020c54c21eb2eb939a3233b44a51e8ca0.tar.bz2 linux-3.10-4383822020c54c21eb2eb939a3233b44a51e8ca0.zip | |
Merge branch 'acpi-pm' into fixes
* acpi-pm:
ACPI / PM: Take unusual configurations of power resources into account
Diffstat (limited to 'drivers/acpi/internal.h')
| -rw-r--r-- | drivers/acpi/internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h index 79092328cf0..4d77716eded 100644 --- a/drivers/acpi/internal.h +++ b/drivers/acpi/internal.h @@ -65,7 +65,7 @@ int acpi_extract_power_resources(union acpi_object *package, unsigned int start, struct list_head *list); int acpi_add_power_resource(acpi_handle handle); void acpi_power_add_remove_device(struct acpi_device *adev, bool add); -int acpi_power_min_system_level(struct list_head *list); +int acpi_power_wakeup_list_init(struct list_head *list, int *system_level); int acpi_device_sleep_wake(struct acpi_device *dev, int enable, int sleep_state, int dev_state); int acpi_power_get_inferred_state(struct acpi_device *device, int *state); |