packages (LINUX_2_6_35): kernel/kernel-multiarch.config, kernel/kernel-patc...

[sparky]

Author: sparky                       Date: Sun May  1 14:43:40 2011 GMT
Module: packages                      Tag: LINUX_2_6_35
---- Log message:
- moved some options around to suite vanilla bcond

---- Files affected:
packages/kernel:
   kernel-multiarch.config (1.44 -> 1.44.2.1) , kernel-patches.config (1.8 -> 1.8.2.1) , kernel-x86.config (1.25 -> 1.25.2.1) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-multiarch.config
diff -u packages/kernel/kernel-multiarch.config:1.44 packages/kernel/kernel-multiarch.config:1.44.2.1
--- packages/kernel/kernel-multiarch.config:1.44	Sun Oct 17 20:22:04 2010
+++ packages/kernel/kernel-multiarch.config	Sun May  1 16:43:35 2011
@@ -5070,7 +5070,6 @@
 #- file fs/jbd/Kconfig goes here
 #- file fs/jbd2/Kconfig goes here
 FS_MBCACHE all=m
-#- file fs/reiser4/Kconfig goes here
 #- file fs/reiserfs/Kconfig goes here
 #- file fs/jfs/Kconfig goes here
 FS_POSIX_ACL all=y
@@ -5102,7 +5101,6 @@
 #- file fs/adfs/Kconfig goes here
 #- file fs/affs/Kconfig goes here
 #- file fs/ecryptfs/Kconfig goes here
-#- file fs/unionfs/Kconfig goes here
 #- file fs/hfs/Kconfig goes here
 #- file fs/hfsplus/Kconfig goes here
 #- file fs/befs/Kconfig goes here
@@ -5122,7 +5120,6 @@
 #- file fs/sysv/Kconfig goes here
 #- file fs/ufs/Kconfig goes here
 #- file fs/exofs/Kconfig goes here
-#- file fs/aufs/Kconfig goes here
 NETWORK_FILESYSTEMS all=y
 #- file fs/nfs/Kconfig goes here
 #- file fs/nfsd/Kconfig goes here
@@ -5588,7 +5585,9 @@
 #-
 #- *** FILE: fs/squashfs/Kconfig ***
 #-
+SQUASHFS all=m
 SQUASHFS_XATTRS all=y
+SQUASHFS_EMBEDDED all=n
 
 #-
 #- *** FILE: fs/sysfs/Kconfig ***
@@ -5770,9 +5769,6 @@
 SUSPEND_FREEZER ppc=y ppc64=y
 HIBERNATION all=y
 PM_STD_PARTITION all=""
-#- Image Storage (you need at least one allocator)
-#- General Options
-#- No compression support available without Cryptoapi support.
 APM_EMULATION ppc=m
 PM_RUNTIME all=y
 
@@ -5810,11 +5806,6 @@
 RING_BUFFER_BENCHMARK all=m
 
 #-
-#- *** FILE: kernel/vserver/Kconfig ***
-#-
-VSERVER_LEGACY_MEM all=y
-
-#-
 #- *** FILE: lib/Kconfig ***
 #-
 BITREVERSE all=y
@@ -6532,7 +6523,6 @@
 #-
 #- *** FILE: security/Kconfig ***
 #-
-#- file grsecurity/Kconfig goes here
 KEYS all=y
 KEYS_DEBUG_PROC_KEYS all=n
 SECURITY all=y
@@ -6543,7 +6533,6 @@
 #- file security/selinux/Kconfig goes here
 #- file security/smack/Kconfig goes here
 #- file security/tomoyo/Kconfig goes here
-#- file security/apparmor/Kconfig goes here
 #- file security/integrity/ima/Kconfig goes here
 DEFAULT_SECURITY_SELINUX all=y
 DEFAULT_SECURITY_SMACK all=n
@@ -6990,6 +6979,7 @@
 USB_GSPCA_SN9C20X_EVDEV all=y
 USB_VST all=m
 USER_SCHED all=n
+VSERVER_LEGACY_MEM all=y
 WAVELAN alpha=m i386=m
 WIRELESS_OLD_REGULATORY all=y
 WLAN_80211 all=y

================================================================
Index: packages/kernel/kernel-patches.config
diff -u packages/kernel/kernel-patches.config:1.8 packages/kernel/kernel-patches.config:1.8.2.1
--- packages/kernel/kernel-patches.config:1.8	Wed Sep 29 10:57:36 2010
+++ packages/kernel/kernel-patches.config	Sun May  1 16:43:35 2011
@@ -21,8 +21,6 @@
 UNION_FS_XATTR all=y
 UNION_FS_DEBUG all=n
 
-SQUASHFS all=m
-SQUASHFS_EMBEDDED all=n
 SQUASHFS_FRAGMENT_CACHE_SIZE all=3
 SQUASHFS_LZMA all=y
 

================================================================
Index: packages/kernel/kernel-x86.config
diff -u packages/kernel/kernel-x86.config:1.25 packages/kernel/kernel-x86.config:1.25.2.1
--- packages/kernel/kernel-x86.config:1.25	Wed Aug 25 20:32:35 2010
+++ packages/kernel/kernel-x86.config	Sun May  1 16:43:35 2011
@@ -47,6 +47,7 @@
 NR_CPUS x86=32
 SCHED_SMT x86=y
 SCHED_MC x86=y
+IRQ_TIME_ACCOUNTING x86=n
 #- file kernel/Kconfig.preempt goes here
 X86_UP_APIC i386=y
 X86_UP_IOAPIC i386=y
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-multiarch.config?r1=1.44&r2=1.44.2.1&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-patches.config?r1=1.8&r2=1.8.2.1&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-x86.config?r1=1.25&r2=1.25.2.1&f=u