From: Andrew Morton <akpm@linux-foundation.org>

argh.

Cc: Nigel Cunningham <nigel@nigel.suspend2.net>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/linux/suspend.h |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

Index: slub/include/linux/suspend.h
===================================================================
--- slub.orig/include/linux/suspend.h	2007-06-08 14:26:59.000000000 -0700
+++ slub/include/linux/suspend.h	2007-06-08 15:04:48.000000000 -0700
@@ -108,14 +108,6 @@ static inline int unregister_pm_notifier
 }
 #else /* CONFIG_PM */
 
-static inline void register_nosave_region(unsigned long b, unsigned long e)
-{
-}
-
-static inline void register_nosave_region_late(unsigned long b, unsigned long e)
-{
-}
-
 static inline int register_pm_notifier(struct notifier_block *nb)
 {
 	return 0;
@@ -129,4 +121,10 @@ static inline int unregister_pm_notifier
 #define pm_notifier(fn, pri)	do { (void)(fn); } while (0)
 #endif /* CONFIG_PM */
 
+#if !defined CONFIG_SOFTWARE_SUSPEND || !defined(CONFIG_PM)
+static inline void register_nosave_region(unsigned long b, unsigned long e)
+{
+}
+#endif
+
 #endif /* _LINUX_SWSUSP_H */