packages: kernel/kernel-multiarch.config, kernel/kernel-x86.config - sort b...

[arekm]

Author: arekm                        Date: Fri Nov 12 16:33:30 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- sort by ./kernel-config-sort.pl

---- Files affected:
packages/kernel:
   kernel-multiarch.config (1.50 -> 1.51) , kernel-x86.config (1.26 -> 1.27) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-multiarch.config
diff -u packages/kernel/kernel-multiarch.config:1.50 packages/kernel/kernel-multiarch.config:1.51
--- packages/kernel/kernel-multiarch.config:1.50	Fri Nov 12 09:24:45 2010
+++ packages/kernel/kernel-multiarch.config	Fri Nov 12 17:33:25 2010
@@ -3981,12 +3981,6 @@
 #- file drivers/staging/octeon/Kconfig goes here
 #- file drivers/staging/serqt_usb2/Kconfig goes here
 #- file drivers/staging/spectra/Kconfig goes here
-
-SPECTRA all=m
-SPECTRA_MRST_HW all=n
-SPECTRA_MTD all=y
-SPECTRA_EMU all=n
-
 #- file drivers/staging/quatech_usb2/Kconfig goes here
 #- file drivers/staging/vt6655/Kconfig goes here
 #- file drivers/staging/vt6656/Kconfig goes here
@@ -4421,6 +4415,14 @@
 SOLO6X10 all=m
 
 #-
+#- *** FILE: drivers/staging/spectra/Kconfig ***
+#-
+SPECTRA all=m
+SPECTRA_MRST_HW all=n
+SPECTRA_MTD all=y
+SPECTRA_EMU all=n
+
+#-
 #- *** FILE: drivers/staging/ti-st/Kconfig ***
 #-
 TI_ST all=m
@@ -5163,7 +5165,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
@@ -5864,6 +5865,9 @@
 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
 
@@ -6619,6 +6623,7 @@
 #-
 #- *** FILE: security/Kconfig ***
 #-
+#- file grsecurity/Kconfig goes here
 KEYS all=y
 KEYS_DEBUG_PROC_KEYS all=n
 SECURITY all=y

================================================================
Index: packages/kernel/kernel-x86.config
diff -u packages/kernel/kernel-x86.config:1.26 packages/kernel/kernel-x86.config:1.27
--- packages/kernel/kernel-x86.config:1.26	Fri Nov 12 09:24:45 2010
+++ packages/kernel/kernel-x86.config	Fri Nov 12 17:33:25 2010
@@ -139,6 +139,7 @@
 #- file drivers/firmware/Kconfig goes here
 #- file fs/Kconfig goes here
 #- file arch/x86/Kconfig.debug goes here
+#- file kernel/vserver/Kconfig goes here
 #- file security/Kconfig goes here
 #- file crypto/Kconfig goes here
 #- file arch/x86/kvm/Kconfig goes here
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-multiarch.config?r1=1.50&r2=1.51&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-x86.config?r1=1.26&r2=1.27&f=u