mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-25 06:03:36 -04:00
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>
This commit is contained in:
parent
5a60d6235c
commit
77afcf78a2
7 changed files with 29 additions and 52 deletions
|
|
@ -122,8 +122,7 @@ extern struct acpi_mcfg_allocation *pci_mmcfg_config;
|
|||
extern int pci_mmcfg_config_num;
|
||||
|
||||
extern int sbf_port;
|
||||
extern unsigned long acpi_video_flags;
|
||||
extern unsigned long s2ram_beep;
|
||||
extern unsigned long acpi_realmode_flags;
|
||||
|
||||
#else /* !CONFIG_ACPI */
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue