diff -ruNp 760-Kconfig-and-Makefile-for-suspend2.patch-old/kernel/power/Kconfig 760-Kconfig-and-Makefile-for-suspend2.patch-new/kernel/power/Kconfig
--- 760-Kconfig-and-Makefile-for-suspend2.patch-old/kernel/power/Kconfig	2005-07-30 15:42:48.000000000 +1000
+++ 760-Kconfig-and-Makefile-for-suspend2.patch-new/kernel/power/Kconfig	2005-07-30 21:13:39.000000000 +1000
@@ -1,5 +1,6 @@
 config PM
 	bool "Power Management support"
+	select SYSFS
 	---help---
 	  "Power Management" means that parts of your computer are shut
 	  off or put into a power conserving "sleep" mode if they are not
@@ -30,6 +31,8 @@ config SOFTWARE_SUSPEND
 	bool "Software Suspend"
 	depends on EXPERIMENTAL && PM && SWAP && ((X86 && SMP) || ((FVR || PPC32 || X86) && !SMP))
 	---help---
+	  Pavel's original version.
+
 	  Enable the possibility of suspending the machine.
 	  It doesn't need APM.
 	  You may suspend your machine by 'swsusp' or 'shutdown -z <time>' 
@@ -76,3 +79,57 @@ config SUSPEND_SMP
 	bool
 	depends on HOTPLUG_CPU && X86 && PM
 	default y
+
+menuconfig SUSPEND2
+	bool "Software Suspend 2"
+	depends on PM
+	---help---
+	  Software Suspend 2 is the 'new and improved' suspend support.
+	  
+	  See the Software Suspend home page (suspend2.net)
+	  for FAQs, HOWTOs and other documentation.
+
+	comment 'Image Storage (you need at least one writer)'
+		depends on SUSPEND2
+	
+	config SUSPEND2_FILEWRITER
+		bool '  File Writer'
+		depends on SUSPEND2
+		---help---
+		  This option enables support for storing an image in a
+		  simple file. This should be possible, but we're still
+		  testing it.
+
+	config SUSPEND2_SWAPWRITER
+		bool '  Swap Writer'
+		depends on SWAP && SUSPEND2
+		---help---
+		  This option enables support for storing an image in your
+		  swap space.
+
+	comment 'General Options'
+		depends on SUSPEND2
+
+	config SUSPEND2_DEFAULT_RESUME2
+		string '  Default resume device name'
+		depends on SUSPEND2
+		---help---
+		  You normally need to add a resume2= parameter to your lilo.conf or
+		  equivalent. With this option properly set, the kernel has a value
+		  to default. No damage will be done if the value is invalid.
+
+	config SUSPEND2_KEEP_IMAGE
+		bool '  Allow Keep Image Mode'
+		depends on SUSPEND2
+		---help---
+		  This option allows you to keep and image and reuse it. It is intended
+		  __ONLY__ for use with systems where all filesystems are mounted read-
+		  only (kiosks, for example). To use it, compile this option in and boot
+		  normally. Set the KEEP_IMAGE flag in /proc/software_suspend and suspend.
+		  When you resume, the image will not be removed. You will be unable to turn
+		  off swap partitions (assuming you are using the swap writer), but future
+		  suspends simply do a power-down. The image can be updated using the
+		  kernel command line parameter suspend_act= to turn off the keep image
+		  bit. Keep image mode is a little less user friendly on purpose - it
+		  should not be used without thought!
+
diff -ruNp 760-Kconfig-and-Makefile-for-suspend2.patch-old/kernel/power/Makefile 760-Kconfig-and-Makefile-for-suspend2.patch-new/kernel/power/Makefile
--- 760-Kconfig-and-Makefile-for-suspend2.patch-old/kernel/power/Makefile	2005-07-30 15:42:48.000000000 +1000
+++ 760-Kconfig-and-Makefile-for-suspend2.patch-new/kernel/power/Makefile	2005-07-30 21:13:39.000000000 +1000
@@ -8,4 +8,23 @@ obj-$(CONFIG_SOFTWARE_SUSPEND)	+= swsusp
 
 obj-$(CONFIG_SUSPEND_SMP)	+= smp.o
 
+obj-$(CONFIG_HOTPLUG_CPU)	+= smp.o
+
+# Order is important for compression and encryption - we
+# compress before encrypting.
+
+suspend_core-objs := io.o pagedir.o prepare_image.o \
+		extent.o suspend.o plugins.o \
+		driver_model.o pageflags.o ui.o proc.o \
+		userspace-nofreeze.o \
+		power_off.o atomic_copy.o
+
+obj-$(CONFIG_SUSPEND2)			+= suspend_core.o
+obj-$(CONFIG_CRYPTO)			+= compression.o encryption.o
+
+obj-$(CONFIG_SUSPEND2_SWAPWRITER)	+= suspend_block_io.o suspend_swap.o
+obj-$(CONFIG_SUSPEND2_FILEWRITER)	+= suspend_block_io.o suspend_file.o
+
+obj-$(CONFIG_SOFTWARE_SUSPEND)	+= swsusp.o disk.o
+
 obj-$(CONFIG_MAGIC_SYSRQ)	+= poweroff.o