Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6

[powerpc.git] / kernel / power / power.h

diff --git a/kernel/power/power.h b/kernel/power/power.h
index 5f842c3..33bd94c 100644 (file)
--- a/kernel/power/power.h
+++ b/kernel/power/power.h
@@ -23,6 +23,8 @@ static inline int pm_suspend_disk(void)
 }
 #endif
 
+extern int pfn_is_nosave(unsigned long);
+
 extern struct mutex pm_mutex;
 
 #define power_attr(_name) \
@@ -37,9 +39,6 @@ static struct subsys_attribute _name##_attr = {       \
 
 extern struct kset power_subsys;
 
-/* References to section boundaries */
-extern const void __nosave_begin, __nosave_end;
-
 /* Preferred image size in bytes (default 500 MB) */
 extern unsigned long image_size;
 extern int in_suspend;