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

[glen]

Author: glen                         Date: Tue Aug 28 22:58:49 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- oops, my sources were wrong, so added back wrong changes and reorganized a little

---- Files affected:
SOURCES:
   kernel-desktop-common.config (1.27 -> 1.28) , kernel-desktop-fbsplash.config (1.1 -> 1.2) , kernel-desktop-patches.config (1.9 -> 1.10) , kernel-desktop-suspend2.config (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/kernel-desktop-common.config
diff -u SOURCES/kernel-desktop-common.config:1.27 SOURCES/kernel-desktop-common.config:1.28
--- SOURCES/kernel-desktop-common.config:1.27	Wed Aug 29 00:32:07 2007
+++ SOURCES/kernel-desktop-common.config	Wed Aug 29 00:58:44 2007
@@ -3196,9 +3196,9 @@
 #
 # Virtualization
 #
-CONFIG_KVM=m
-CONFIG_KVM_INTEL=m
-CONFIG_KVM_AMD=m
+# CONFIG_KVM is not set
+# CONFIG_KVM_INTEL is not set
+# CONFIG_KVM_AMD is not set
 
 #
 # Firmware Drivers
@@ -3294,8 +3294,6 @@
 #
 # Pseudo filesystems
 #
-CONFIG_SUPERMOUNT=m
-# CONFIG_SUPERMOUNT_DEBUG is not set
 CONFIG_PROC_FS=y
 # CONFIG_PROC_KCORE is not set
 CONFIG_SYSFS=y
@@ -3596,27 +3594,3 @@
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
-
-#
-# Linux VServer
-#
-CONFIG_VSERVER_AUTO_LBACK=y
-CONFIG_VSERVER_AUTO_SINGLE=y
-CONFIG_VSERVER_COWBL=y
-# CONFIG_VSERVER_VTIME is not set
-CONFIG_VSERVER_PROC_SECURE=y
-CONFIG_VSERVER_HARDCPU=y
-CONFIG_VSERVER_IDLETIME=y
-# CONFIG_VSERVER_IDLELIMIT is not set
-# CONFIG_TAGGING_NONE is not set
-# CONFIG_TAGGING_UID16 is not set
-# CONFIG_TAGGING_GID16 is not set
-CONFIG_TAGGING_ID24=y
-# CONFIG_TAGGING_INTERN is not set
-# CONFIG_TAG_NFSD is not set
-# CONFIG_VSERVER_PRIVACY is not set
-CONFIG_VSERVER_CONTEXTS=256
-CONFIG_VSERVER_WARN=y
-# CONFIG_VSERVER_DEBUG is not set
-CONFIG_VSERVER=y
-CONFIG_VSERVER_SECURITY=y

================================================================
Index: SOURCES/kernel-desktop-fbsplash.config
diff -u SOURCES/kernel-desktop-fbsplash.config:1.1 SOURCES/kernel-desktop-fbsplash.config:1.2
--- SOURCES/kernel-desktop-fbsplash.config:1.1	Tue Aug 28 19:44:29 2007
+++ SOURCES/kernel-desktop-fbsplash.config	Wed Aug 29 00:58:44 2007
@@ -1,5 +1,4 @@
 # CONFIG_FB_S3 is not set
 # CONFIG_FB_VT8623 is not set
 # CONFIG_FB_ARK is not set
-
 CONFIG_FB_SPLASH=y

================================================================
Index: SOURCES/kernel-desktop-patches.config
diff -u SOURCES/kernel-desktop-patches.config:1.9 SOURCES/kernel-desktop-patches.config:1.10
--- SOURCES/kernel-desktop-patches.config:1.9	Tue Aug 28 23:10:03 2007
+++ SOURCES/kernel-desktop-patches.config	Wed Aug 29 00:58:44 2007
@@ -6,17 +6,14 @@
 CONFIG_FB_VESA_TNG=y
 CONFIG_FB_VESA_DEFAULT_MODE="off"
 
-
 CONFIG_SQUASHFS=m
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_SQUASHFS_VMALLOC is not set
 
-
 CONFIG_NET_SCH_ESFQ=m
 CONFIG_NET_SCH_ESFQ_NFCT=y
 
-
 CONFIG_IMQ=m
 # CONFIG_IMQ_BEHAVIOR_AA is not set
 CONFIG_IMQ_BEHAVIOR_AB=y
@@ -24,12 +21,15 @@
 # CONFIG_IMQ_BEHAVIOR_BB is not set
 CONFIG_IMQ_NUM_DEVS=2
 
-
 CONFIG_TAHOE9XX=m
 
-
 CONFIG_ATM_DD=m
 
-
 CONFIG_REISER4_FS=m
 # CONFIG_REISER4_DEBUG is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_SUPERMOUNT=m
+# CONFIG_SUPERMOUNT_DEBUG is not set

================================================================
Index: SOURCES/kernel-desktop-suspend2.config
diff -u SOURCES/kernel-desktop-suspend2.config:1.4 SOURCES/kernel-desktop-suspend2.config:1.5
--- SOURCES/kernel-desktop-suspend2.config:1.4	Sun Aug 19 00:53:00 2007
+++ SOURCES/kernel-desktop-suspend2.config	Wed Aug 29 00:58:44 2007
@@ -8,3 +8,8 @@
 
 # CONFIG_SUSPEND2_KEEP_IMAGE is not set
 # CONFIG_SUSPEND2_REPLACE_SWSUSP is not set
+
+CONFIG_SUSPEND2_CORE=m
+CONFIG_SUSPEND2_USERUI=m
+CONFIG_SUSPEND2_CHECKSUM=y
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-desktop-common.config?r1=1.27&r2=1.28&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-desktop-fbsplash.config?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-desktop-patches.config?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-desktop-suspend2.config?r1=1.4&r2=1.5&f=u