- sort by ./kernel-config-sort.pl

Changed files:
    kernel-multiarch.config -> 1.51
    kernel-x86.config -> 1.27

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index c63f224dcdb8c9dd99e9fe687d03d3d261f58c5d..fbb7a52438ca5b14fd07e42a7aebecd216415a86 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -3981,12 +3981,6 @@ STAGING_EXCLUDE_BUILD all=n
 #- 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
@@ -4420,6 +4414,14 @@ FB_SM7XX all=m
 #-
 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 ***
 #-
@@ -5163,7 +5165,6 @@ FS_XIP all=y
 #- 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 all=y
 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 @@ SAMPLES all=n
 #-
 #- *** FILE: security/Kconfig ***
 #-
+#- file grsecurity/Kconfig goes here
 KEYS all=y
 KEYS_DEBUG_PROC_KEYS all=n
 SECURITY all=y

diff --git a/kernel-x86.config b/kernel-x86.config
index ef2385a0637c32a1b6aac06214d440faf6e7df45..ace24c19b636fc458e155f1e6a6f8fae2971371b 100644 (file)
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -139,6 +139,7 @@ IA32_AOUT x86_64=y
 #- 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