diff options
| author | Pavel Machek <pavel@suse.cz> | 2007-07-19 04:47:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 13:04:43 -0400 |
| commit | 77afcf78a2ded9a91838734234949c0ead5feb12 (patch) | |
| tree | 76922017855c70d550b40241f8a144f6c098cd04 /include | |
| parent | 5a60d6235c8352ade8f2699e72fcdfe853730456 (diff) | |
PM: Integrate beeping flag with existing acpi_sleep flags
Move "debug during resume from s2ram" into the variable we already use
for real-mode flags to simplify code. It also closes nasty trap for
the user in acpi_sleep_setup; order of parameters actually mattered there,
acpi_sleep=s3_bios,s3_mode doing something different from
acpi_sleep=s3_mode,s3_bios.
Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/acpi.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index c0ccdd720363..dc234c508a6f 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h | |||
| @@ -122,8 +122,7 @@ extern struct acpi_mcfg_allocation *pci_mmcfg_config; | |||
| 122 | extern int pci_mmcfg_config_num; | 122 | extern int pci_mmcfg_config_num; |
| 123 | 123 | ||
| 124 | extern int sbf_port; | 124 | extern int sbf_port; |
| 125 | extern unsigned long acpi_video_flags; | 125 | extern unsigned long acpi_realmode_flags; |
| 126 | extern unsigned long s2ram_beep; | ||
| 127 | 126 | ||
| 128 | #else /* !CONFIG_ACPI */ | 127 | #else /* !CONFIG_ACPI */ |
| 129 | 128 | ||