- moved some options around to suite vanilla bcond

Changed files:
    kernel-multiarch.config -> 1.68
    kernel-patches.config -> 1.10

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 7e1a8b4f4e26e2c6755017269117633492b1b731..a629b82ff7373818ba9d91d76c17098c5359201b 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -5181,7 +5181,6 @@ VHOST_NET all=m
 #- file drivers/char/agp/Kconfig goes here
 #- file drivers/gpu/vga/Kconfig goes here
 #- file drivers/gpu/drm/Kconfig goes here
-#- file drivers/gpu/misc/Kconfig goes here
 #- file drivers/gpu/stub/Kconfig goes here
 VGASTATE all=m
 VIDEO_OUTPUT_CONTROL all=m
@@ -5522,7 +5521,6 @@ MISC_FILESYSTEMS all=y
 #- 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
@@ -5542,7 +5540,6 @@ MISC_FILESYSTEMS all=y
 #- 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
@@ -6003,9 +6000,11 @@ ROMFS_BACKED_BY_BLOCK all=y
 #-
 #- *** FILE: fs/squashfs/Kconfig ***
 #-
+SQUASHFS all=m
 SQUASHFS_XATTR all=y
 SQUASHFS_LZO all=y
 SQUASHFS_XZ all=y
+SQUASHFS_EMBEDDED all=n
 
 #-
 #- *** FILE: fs/sysfs/Kconfig ***
@@ -6196,9 +6195,6 @@ 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
 
@@ -6333,10 +6329,10 @@ DYNAMIC_DEBUG all=n
 DMA_API_DEBUG all=n
 ATOMIC64_SELFTEST all=n
 ASYNC_RAID6_TEST all=m
-TEST_KSTRTOX all=m
 #- file samples/Kconfig goes here
 #- file lib/Kconfig.kgdb goes here
 #- file lib/Kconfig.kmemcheck goes here
+TEST_KSTRTOX all=m
 
 #-
 #- *** FILE: lib/Kconfig.kgdb ***
@@ -7023,7 +7019,6 @@ DEFAULT_SECURITY all=""
 #-
 SECURITY_APPARMOR=y
 SECURITY_APPARMOR_BOOTPARAM_VALUE=1
-SECURITY_APPARMOR_COMPAT_24=y
 
 #-
 #- *** FILE: security/integrity/ima/Kconfig ***
@@ -7498,6 +7493,7 @@ RT3090 all=m
 RTC_DRV_MC13783 all=m
 RTL8187SE all=m
 RTL8192SU all=m
+SECURITY_APPARMOR_COMPAT_24=y
 SECURITY_APPARMOR_DISABLE=n
 SECURITY_APPARMOR_NETWORK=y
 SECURITY_FILE_CAPABILITIES all=y

diff --git a/kernel-patches.config b/kernel-patches.config
index 6faedcc51b0a841df679cc123d39b5e9f3c374de..d3cb72c0dbf2e830ba59f11eabb99002c19b4c50 100644 (file)
--- a/kernel-patches.config
+++ b/kernel-patches.config
@@ -21,8 +21,6 @@ UNION_FS all=m
 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