diff options
author | Ingo Molnar | 2008-07-18 10:14:56 +0200 |
---|---|---|
committer | Ingo Molnar | 2008-07-18 10:14:56 +0200 |
commit | 48ae74443403ab25876959e84785f61bf421ccef (patch) | |
tree | dd6d8277f2f0e691edf49a38ff9a804f9a1532d0 /include/acpi/acpi_drivers.h | |
parent | Merge branch 'x86/step' of git://git.kernel.org/pub/scm/linux/kernel/git/frob... (diff) | |
parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
download | kernel-qcow2-linux-48ae74443403ab25876959e84785f61bf421ccef.tar.gz kernel-qcow2-linux-48ae74443403ab25876959e84785f61bf421ccef.tar.xz kernel-qcow2-linux-48ae74443403ab25876959e84785f61bf421ccef.zip |
Merge branch 'linus' into x86/step
Diffstat (limited to 'include/acpi/acpi_drivers.h')
-rw-r--r-- | include/acpi/acpi_drivers.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h index 9757a040a505..e5f38e5ce86f 100644 --- a/include/acpi/acpi_drivers.h +++ b/include/acpi/acpi_drivers.h @@ -87,7 +87,9 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_device *device, int domain, -------------------------------------------------------------------------- */ #ifdef CONFIG_ACPI_POWER -int acpi_enable_wakeup_device_power(struct acpi_device *dev); +int acpi_device_sleep_wake(struct acpi_device *dev, + int enable, int sleep_state, int dev_state); +int acpi_enable_wakeup_device_power(struct acpi_device *dev, int sleep_state); int acpi_disable_wakeup_device_power(struct acpi_device *dev); int acpi_power_get_inferred_state(struct acpi_device *device); int acpi_power_transition(struct acpi_device *device, int state); |