summaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-07-25 01:36:31 -0400
committerLen Brown <len.brown@intel.com>2007-07-25 01:36:31 -0400
commitcb3e0c107bebc6cf3e7158f7aa54c32017c7d4c4 (patch)
tree2c52ac06cce163bf467d259119b824eed96f2eca /include/acpi
parent1e1f3f24cdbc53e67acd7b2e37e6cf0cb11bd13c (diff)
parent50ad147aa09c829cd452fae6ca99396c0b5b0695 (diff)
downloadlinux-cb3e0c107bebc6cf3e7158f7aa54c32017c7d4c4.tar.gz
linux-cb3e0c107bebc6cf3e7158f7aa54c32017c7d4c4.tar.bz2
linux-cb3e0c107bebc6cf3e7158f7aa54c32017c7d4c4.zip
Pull d-states into release branch
Conflicts: drivers/acpi/sleep/main.c Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acpi_bus.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 5e3dcf3299bf..a9f73efa01bc 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -365,6 +365,8 @@ acpi_handle acpi_get_child(acpi_handle, acpi_integer);
acpi_handle acpi_get_pci_rootbridge_handle(unsigned int, unsigned int);
#define DEVICE_ACPI_HANDLE(dev) ((acpi_handle)((dev)->archdata.acpi_handle))
+int acpi_pm_device_sleep_state(struct device *, int, int *);
+
#endif /* CONFIG_ACPI */
#endif /*__ACPI_BUS_H__*/