Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

[powerpc.git] / include / asm-i386 / e820.h

diff --git a/include/asm-i386/e820.h b/include/asm-i386/e820.h
index 43114c8..cf67dbb 100644 (file)
--- a/include/asm-i386/e820.h
+++ b/include/asm-i386/e820.h
@@ -47,7 +47,7 @@ extern void e820_register_memory(void);
 extern void limit_regions(unsigned long long size);
 extern void print_memory_map(char *who);
 
-#if defined(CONFIG_PM) && defined(CONFIG_SOFTWARE_SUSPEND)
+#if defined(CONFIG_PM) && defined(CONFIG_HIBERNATION)
 extern void e820_mark_nosave_regions(void);
 #else
 static inline void e820_mark_nosave_regions(void)