summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-12 17:18:05 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-12 17:18:05 -0700
commitaaa119a3d4e0b7421c82ae3fbe288e65d0f3485f (patch)
tree134923311a0ec019a1365f3ed87ffe32dae37f19 /arch/x86
parent6faf9a54156fb4d01d73344cc90cb52dda074433 (diff)
parentd419e4c0f7584ffc5c72d9aeeaac485cc756ebcf (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: fix XEN_SAVE_RESTORE Kconfig dependencies PM / Hibernate: Introduce CONFIG_HIBERNATE_CALLBACKS
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/xen/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
index 1c7121ba18ff..5cc821cb2e09 100644
--- a/arch/x86/xen/Kconfig
+++ b/arch/x86/xen/Kconfig
@@ -39,6 +39,7 @@ config XEN_MAX_DOMAIN_MEMORY
config XEN_SAVE_RESTORE
bool
depends on XEN
+ select HIBERNATE_CALLBACKS
default y
config XEN_DEBUG_FS