diff options
| author | Linus Torvalds | 2011-04-13 02:18:05 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2011-04-13 02:18:05 +0200 |
| commit | aaa119a3d4e0b7421c82ae3fbe288e65d0f3485f (patch) | |
| tree | 134923311a0ec019a1365f3ed87ffe32dae37f19 /arch/x86/xen | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (diff) | |
| parent | fix XEN_SAVE_RESTORE Kconfig dependencies (diff) | |
| download | kernel-qcow2-linux-aaa119a3d4e0b7421c82ae3fbe288e65d0f3485f.tar.gz kernel-qcow2-linux-aaa119a3d4e0b7421c82ae3fbe288e65d0f3485f.tar.xz kernel-qcow2-linux-aaa119a3d4e0b7421c82ae3fbe288e65d0f3485f.zip | |
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/xen')
| -rw-r--r-- | arch/x86/xen/Kconfig | 1 |
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 |