SOURCES: kernel-desktop-common.config, kernel-desktop-suspend2.con...

[glen]

Author: glen                         Date: Sun Oct 28 19:38:11 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- make kernel build happy

---- Files affected:
SOURCES:
   kernel-desktop-common.config (1.29 -> 1.30) , kernel-desktop-suspend2.config (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/kernel-desktop-common.config
diff -u SOURCES/kernel-desktop-common.config:1.29 SOURCES/kernel-desktop-common.config:1.30
--- SOURCES/kernel-desktop-common.config:1.29	Sun Oct 28 19:48:18 2007
+++ SOURCES/kernel-desktop-common.config	Sun Oct 28 20:38:05 2007
@@ -110,8 +110,6 @@
 CONFIG_PM_LEGACY=y
 # CONFIG_PM_DEBUG is not set
 # CONFIG_PM_SYSFS_DEPRECATED is not set
-# CONFIG_SOFTWARE_SUSPEND is not set
-CONFIG_SUSPEND_SMP=y
 
 #
 # Bus options (PCI etc.)

================================================================
Index: SOURCES/kernel-desktop-suspend2.config
diff -u SOURCES/kernel-desktop-suspend2.config:1.5 SOURCES/kernel-desktop-suspend2.config:1.6
--- SOURCES/kernel-desktop-suspend2.config:1.5	Wed Aug 29 00:58:44 2007
+++ SOURCES/kernel-desktop-suspend2.config	Sun Oct 28 20:38:06 2007
@@ -13,3 +13,4 @@
 CONFIG_SUSPEND2_USERUI=m
 CONFIG_SUSPEND2_CHECKSUM=y
 
+CONFIG_SUSPEND2_DEFAULT_WAIT=25
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-desktop-common.config?r1=1.29&r2=1.30&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-desktop-suspend2.config?r1=1.5&r2=1.6&f=u