diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-28 17:42:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-28 17:42:18 -0400 |
| commit | 9a90e09854a3c7cc603ab8fc9163f77bb1f66cfa (patch) | |
| tree | c8c5f767dd2351c9db440f003cc14401583bafd3 /drivers/acpi/sleep.h | |
| parent | d372e7fe4698bde3a00b718f7901a0025dda47ef (diff) | |
| parent | d3b383338f105f50724c10a7d81b04a3930e886b (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (27 commits)
ACPI: Don't let acpi_pad needlessly mark TSC unstable
drivers/acpi/sleep.h: Checkpatch cleanup
ACPI: Minor cleanup eliminating redundant PMTIMER_TICKS to NS conversion
ACPI: delete unused c-state promotion/demotion data strucutures
ACPI: video: fix acpi_backlight=video
ACPI: EC: Use kmemdup
drivers/acpi: use kasprintf
ACPI, APEI, EINJ injection parameters support
Add x64 support to debugfs
ACPI, APEI, Use ERST for persistent storage of MCE
ACPI, APEI, Error Record Serialization Table (ERST) support
ACPI, APEI, Generic Hardware Error Source memory error support
ACPI, APEI, UEFI Common Platform Error Record (CPER) header
Unified UUID/GUID definition
ACPI Hardware Error Device (PNP0C33) support
ACPI, APEI, PCIE AER, use general HEST table parsing in AER firmware_first setup
ACPI, APEI, Document for APEI
ACPI, APEI, EINJ support
ACPI, APEI, HEST table parsing
ACPI, APEI, APEI supporting infrastructure
...
Diffstat (limited to 'drivers/acpi/sleep.h')
| -rw-r--r-- | drivers/acpi/sleep.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/sleep.h b/drivers/acpi/sleep.h index 8a8f3b3382a6..25b8bd149284 100644 --- a/drivers/acpi/sleep.h +++ b/drivers/acpi/sleep.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | 1 | ||
| 2 | extern u8 sleep_states[]; | 2 | extern u8 sleep_states[]; |
| 3 | extern int acpi_suspend (u32 state); | 3 | extern int acpi_suspend(u32 state); |
| 4 | 4 | ||
| 5 | extern void acpi_enable_wakeup_device_prep(u8 sleep_state); | 5 | extern void acpi_enable_wakeup_device_prep(u8 sleep_state); |
| 6 | extern void acpi_enable_wakeup_device(u8 sleep_state); | 6 | extern void acpi_enable_wakeup_device(u8 sleep_state); |