diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-22 09:06:21 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-22 09:06:21 +0200 |
| commit | 76c3bb15d6786a0b8da0ad0090e0c9c3672fc08b (patch) | |
| tree | 3824e008db9d554229a70c85fbbc13238276bd7a /kernel | |
| parent | 7be42004065ce4df193aeef5befd26805267d0d9 (diff) | |
| parent | 93ded9b8fd42abe2c3607097963d8de6ad9117eb (diff) | |
| download | op-kernel-dev-76c3bb15d6786a0b8da0ad0090e0c9c3672fc08b.zip op-kernel-dev-76c3bb15d6786a0b8da0ad0090e0c9c3672fc08b.tar.gz | |
Merge branch 'linus' into x86/x2apic
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/power/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig index b45da40..59dfdf1 100644 --- a/kernel/power/Kconfig +++ b/kernel/power/Kconfig @@ -82,7 +82,7 @@ config PM_SLEEP_SMP config PM_SLEEP bool - depends on SUSPEND || HIBERNATION + depends on SUSPEND || HIBERNATION || XEN_SAVE_RESTORE default y config SUSPEND |
