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 /drivers/acpi/internal.h | |
| parent | 1ae5ec903f71c0ffa583ec54d17415892036ee18 (diff) | |
| parent | 53eac700b0df1fef8c957b9eedfd7f48120425e3 (diff) | |
| download | kernel_replicant_linux-07bf280521bb06bc8e64f0b998fc391253fcb959.tar.gz kernel_replicant_linux-07bf280521bb06bc8e64f0b998fc391253fcb959.tar.bz2 kernel_replicant_linux-07bf280521bb06bc8e64f0b998fc391253fcb959.zip | |
Merge branch 'power-resource' into release
Diffstat (limited to 'drivers/acpi/internal.h')
| -rw-r--r-- | drivers/acpi/internal.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h index a212bfeddf8c..8df5d7061a45 100644 --- a/drivers/acpi/internal.h +++ b/drivers/acpi/internal.h @@ -41,9 +41,10 @@ static inline int acpi_debugfs_init(void) { return 0; } int acpi_power_init(void); 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 acpi_power_get_inferred_state(struct acpi_device *device, int *state); +int acpi_power_on_resources(struct acpi_device *device, int state); int acpi_power_transition(struct acpi_device *device, int state); -extern int acpi_power_nocheck; +int acpi_bus_init_power(struct acpi_device *device); int acpi_wakeup_device_init(void); void acpi_early_processor_set_pdc(void); |