diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-10-03 15:33:17 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-10-03 15:33:17 +1000 |
| commit | 70f227d8846a8a9b1f36f71c42e11cc7c6e9408d (patch) | |
| tree | fb4dd5c8240bdaada819fb569c01a392b52847b9 /include/acpi/processor.h | |
| parent | a0c7ce9c877ceef8428798ac91fb794f83609aed (diff) | |
| parent | f778089cb2445dfc6dfd30a7a567925fd8589f1e (diff) | |
| download | kernel-crypto-70f227d8846a8a9b1f36f71c42e11cc7c6e9408d.tar.gz kernel-crypto-70f227d8846a8a9b1f36f71c42e11cc7c6e9408d.tar.xz kernel-crypto-70f227d8846a8a9b1f36f71c42e11cc7c6e9408d.zip | |
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'include/acpi/processor.h')
| -rw-r--r-- | include/acpi/processor.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index ec3ffdadb4d..99934a999e6 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h @@ -320,6 +320,8 @@ int acpi_processor_power_init(struct acpi_processor *pr, int acpi_processor_cst_has_changed(struct acpi_processor *pr); int acpi_processor_power_exit(struct acpi_processor *pr, struct acpi_device *device); +int acpi_processor_suspend(struct acpi_device * device, pm_message_t state); +int acpi_processor_resume(struct acpi_device * device); /* in processor_thermal.c */ int acpi_processor_get_limit_info(struct acpi_processor *pr); |