Browse Source

fix XEN_SAVE_RESTORE Kconfig dependencies

Make XEN_SAVE_RESTORE select HIBERNATE_CALLBACKS.
Remove XEN_SAVE_RESTORE dependency from PM_SLEEP.

Signed-off-by: Shriram Rajagopalan <rshriram@cs.ubc.ca>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Shriram Rajagopalan 14 years ago
parent
commit
d419e4c0f7
2 changed files with 2 additions and 1 deletions
  1. 1 0
      arch/x86/xen/Kconfig
  2. 1 1
      kernel/power/Kconfig

+ 1 - 0
arch/x86/xen/Kconfig

@@ -39,6 +39,7 @@ config XEN_MAX_DOMAIN_MEMORY
 config XEN_SAVE_RESTORE
 config XEN_SAVE_RESTORE
        bool
        bool
        depends on XEN
        depends on XEN
+       select HIBERNATE_CALLBACKS
        default y
        default y
 
 
 config XEN_DEBUG_FS
 config XEN_DEBUG_FS

+ 1 - 1
kernel/power/Kconfig

@@ -89,7 +89,7 @@ config PM_STD_PARTITION
 
 
 config PM_SLEEP
 config PM_SLEEP
 	def_bool y
 	def_bool y
-	depends on SUSPEND || HIBERNATE_CALLBACKS || XEN_SAVE_RESTORE
+	depends on SUSPEND || HIBERNATE_CALLBACKS
 
 
 config PM_SLEEP_SMP
 config PM_SLEEP_SMP
 	def_bool y
 	def_bool y