diff options
| author | Len Brown <len.brown@intel.com> | 2007-07-25 01:36:31 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-07-25 01:36:31 -0400 |
| commit | cb3e0c107bebc6cf3e7158f7aa54c32017c7d4c4 (patch) | |
| tree | 2c52ac06cce163bf467d259119b824eed96f2eca /include | |
| parent | 1e1f3f24cdbc53e67acd7b2e37e6cf0cb11bd13c (diff) | |
| parent | 50ad147aa09c829cd452fae6ca99396c0b5b0695 (diff) | |
| download | op-kernel-dev-cb3e0c107bebc6cf3e7158f7aa54c32017c7d4c4.zip op-kernel-dev-cb3e0c107bebc6cf3e7158f7aa54c32017c7d4c4.tar.gz | |
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')
| -rw-r--r-- | include/acpi/acpi_bus.h | 2 | ||||
| -rw-r--r-- | include/linux/pnp.h | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 5e3dcf3..a9f73ef 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__*/ diff --git a/include/linux/pnp.h b/include/linux/pnp.h index 2a1897e..66edb22 100644 --- a/include/linux/pnp.h +++ b/include/linux/pnp.h @@ -335,6 +335,10 @@ struct pnp_protocol { int (*set)(struct pnp_dev *dev, struct pnp_resource_table *res); int (*disable)(struct pnp_dev *dev); + /* protocol specific suspend/resume */ + int (*suspend)(struct pnp_dev *dev, pm_message_t state); + int (*resume)(struct pnp_dev *dev); + /* used by pnp layer only (look but don't touch) */ unsigned char number; /* protocol number*/ struct device dev; /* link to driver model */ |
