diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-13 12:58:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-13 12:58:22 -0500 |
| commit | 417009f64f17d76322d148a2cda40dfec37bcf0b (patch) | |
| tree | 5c02e4888a083e276a49ec1f58cd492ca5532e1b /kernel/power/main.c | |
| parent | ba67a39efde8312e386c6f603054f8945433d91f (diff) | |
| parent | 55d1bb9a3b0f7f791ce597086791ebe54ea4c46a (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:
pnpacpi: print resource shortage message only once
PM: ACPI and APM must not be enabled at the same time
ACPI: apply quirk_ich6_lpc_acpi to more ICH8 and ICH9
ACPICA: fix acpi_serialize hang regression
ACPI : Not register gsi for PCI IDE controller in legacy mode
ACPI: Reintroduce run time configurable max_cstate for !CPU_IDLE case
ACPI: Make sysfs interface in ACPI power optional.
ACPI: EC: Enable boot EC before bus_scan
increase PNP_MAX_PORT to 40 from 24
Diffstat (limited to 'kernel/power/main.c')
| -rw-r--r-- | kernel/power/main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c index 3cdf95b1dc92..f71c9504a5c5 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c | |||
| @@ -28,6 +28,9 @@ BLOCKING_NOTIFIER_HEAD(pm_chain_head); | |||
| 28 | 28 | ||
| 29 | DEFINE_MUTEX(pm_mutex); | 29 | DEFINE_MUTEX(pm_mutex); |
| 30 | 30 | ||
| 31 | unsigned int pm_flags; | ||
| 32 | EXPORT_SYMBOL(pm_flags); | ||
| 33 | |||
| 31 | #ifdef CONFIG_SUSPEND | 34 | #ifdef CONFIG_SUSPEND |
| 32 | 35 | ||
| 33 | /* This is just an arbitrary number */ | 36 | /* This is just an arbitrary number */ |