--- suspend-0.8.20080612/suspend.c.no_s2ram_quirks	2009-02-04 11:30:57.000000000 +0300
+++ suspend-0.8.20080612/suspend.c	2009-02-04 11:32:57.000000000 +0300
@@ -89,9 +89,6 @@ static unsigned long encrypt_buf_size;
 #define key_name NULL
 #define encrypt_buf_size 0
 #endif
-#ifdef CONFIG_BOTH
-static char s2ram;
-#endif
 static char early_writeout;
 static char splash_param;
 #ifdef CONFIG_FBSPLASH
@@ -1786,7 +1783,7 @@ int suspend_system(int snapshot_fd, int 
 		} else {
 			splash.progress(100);
 #ifdef CONFIG_BOTH
-			if (s2ram) {
+			{
 				/* If we die (and allow system to continue)
 				 * between now and reset_signature(), very bad
 				 * things will happen. */
@@ -1796,7 +1793,6 @@ int suspend_system(int snapshot_fd, int 
 				reset_signature(resume_fd);
 				free_swap_pages(snapshot_fd);
 				free_snapshot(snapshot_fd);
-				s2ram_resume();
 				goto Unfreeze;
 			}
 Shutdown:
@@ -2277,18 +2273,6 @@ static inline int get_config(int argc, c
 	if (optind < argc)
 		strncpy(resume_dev_name, argv[optind], MAX_STR_LEN - 1);
 
-#ifdef CONFIG_BOTH
-	s2ram = s2ram_is_supported();
-	/* s2ram_is_supported returns EINVAL if there was something wrong
-	 * with the options that where added with s2ram_add_flag.
-	 * On any other error (unsupported) we will just continue with s2disk.
-	 */
-	if (s2ram == EINVAL)
-		return -EINVAL;
-	
-	s2ram = !s2ram;
-#endif
-
 	return 0;
 }
 
@@ -2515,11 +2499,6 @@ int main(int argc, char *argv[])
 
 	splash.progress(5);
 
-#ifdef CONFIG_BOTH
-	/* If s2ram_hacks returns != 0, better not try to suspend to RAM */
-	if (s2ram) 
-		s2ram = !s2ram_hacks();
-#endif
 #ifdef CONFIG_ENCRYPT
         if (do_encrypt && ! use_RSA)
                 splash.read_password(password, 1);