diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-13 13:49:59 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-13 13:49:59 +1000 |
| commit | 40defdeda12133674060421979ed42d5bc502965 (patch) | |
| tree | 06ba415b62953754570fb115cd23dafab672ade5 /arch/x86/kernel/acpi/sleep.c | |
| parent | f2603c77e8cd7777742da9eb8feea06fbd85c267 (diff) | |
| parent | d8f3de0d2412bb91639cfefc5b3c79dbf3812212 (diff) | |
Merge commit 'pci/linux-next'
Conflicts:
arch/x86/pci/irq.c
include/linux/device.h
Diffstat (limited to 'arch/x86/kernel/acpi/sleep.c')
| -rw-r--r-- | arch/x86/kernel/acpi/sleep.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c index afc25ee9964b..882e970032d5 100644 --- a/arch/x86/kernel/acpi/sleep.c +++ b/arch/x86/kernel/acpi/sleep.c @@ -124,6 +124,8 @@ static int __init acpi_sleep_setup(char *str) acpi_realmode_flags |= 2; if (strncmp(str, "s3_beep", 7) == 0) acpi_realmode_flags |= 4; + if (strncmp(str, "old_ordering", 12) == 0) + acpi_old_suspend_ordering(); str = strchr(str, ','); if (str != NULL) str += strspn(str, ", \t"); |