1 files changed, 0 insertions, 22 deletions
diff --git a/kernel-i686.config b/kernel-i686.config
index b59b97f81..9cb41e257 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -104,7 +104,6 @@ CONFIG_AD5272=m
 # CONFIG_AD5933 is not set
 CONFIG_AD7124=m
 # CONFIG_AD7150 is not set
-# CONFIG_AD7152 is not set
 # CONFIG_AD7192 is not set
 # CONFIG_AD7266 is not set
 # CONFIG_AD7280 is not set
@@ -1081,8 +1080,6 @@ CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 # CONFIG_DEFAULT_RENO is not set
-# CONFIG_DEFAULT_SECURITY_DAC is not set
-CONFIG_DEFAULT_SECURITY_SELINUX=y
 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
 CONFIG_DELL_LAPTOP=m
 CONFIG_DELL_RBTN=m
@@ -1368,7 +1365,6 @@ CONFIG_E1000E=m
 CONFIG_E1000=m
 CONFIG_E100=m
 CONFIG_EARLY_PRINTK_DBGP=y
-CONFIG_EARLY_PRINTK_EFI=y
 CONFIG_EARLY_PRINTK_USB_XDBC=y
 # CONFIG_EBC_C384_WDT is not set
 CONFIG_ECHO=m
@@ -1442,7 +1438,6 @@ CONFIG_ETHERNET=y
 CONFIG_ETHOC=m
 # CONFIG_EUROTECH_WDT is not set
 # CONFIG_EVM is not set
-# CONFIG_EXOFS_FS is not set
 # CONFIG_EXPERT is not set
 # CONFIG_EXPOLINE_AUTO is not set
 CONFIG_EXPOLINE_FULL=y
@@ -1451,7 +1446,6 @@ CONFIG_EXPORTFS=y
 # CONFIG_EXT2_FS is not set
 # CONFIG_EXT3_FS is not set
 # CONFIG_EXT4_DEBUG is not set
-CONFIG_EXT4_ENCRYPTION=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_FS=y
@@ -1470,7 +1464,6 @@ CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_EZX_PCAP is not set
 # CONFIG_F2FS_CHECK_FS is not set
 # CONFIG_F2FS_FAULT_INJECTION is not set
-# CONFIG_F2FS_FS_ENCRYPTION is not set
 CONFIG_F2FS_FS=m
 CONFIG_F2FS_FS_POSIX_ACL=y
 CONFIG_F2FS_FS_SECURITY=y
@@ -1552,7 +1545,6 @@ CONFIG_FB_VGA16=m
 CONFIG_FB_VIRTUAL=m
 # CONFIG_FB_VOODOO1 is not set
 # CONFIG_FB_VT8623 is not set
-# CONFIG_FB_XGI is not set
 CONFIG_FB=y
 CONFIG_FCOE_FNIC=m
 CONFIG_FCOE=m
@@ -3743,8 +3735,6 @@ CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NF_TABLES_SET=m
 CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_NAT_IPV4=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 CONFIG_NFT_COMPAT=m
@@ -3764,8 +3754,6 @@ CONFIG_NFT_HASH=m
 CONFIG_NFT_LIMIT=m
 # CONFIG_NFTL is not set
 CONFIG_NFT_LOG=m
-CONFIG_NFT_MASQ_IPV4=m
-CONFIG_NFT_MASQ_IPV6=m
 CONFIG_NFT_MASQ=m
 CONFIG_NFT_NAT=m
 CONFIG_NFT_NUMGEN=m
@@ -3775,8 +3763,6 @@ CONFIG_NF_TPROXY_IPV4=m
 CONFIG_NF_TPROXY_IPV6=m
 CONFIG_NFT_QUEUE=m
 CONFIG_NFT_QUOTA=m
-CONFIG_NFT_REDIR_IPV4=m
-CONFIG_NFT_REDIR_IPV6=m
 CONFIG_NFT_REDIR=m
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_REJECT=m
@@ -4668,10 +4654,6 @@ CONFIG_SCSI_MVUMI=m
 CONFIG_SCSI_MYRB=m
 CONFIG_SCSI_MYRS=m
 # CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_OSD_DEBUG is not set
-CONFIG_SCSI_OSD_DPRINT_SENSE=1
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_OSD_ULD=m
 CONFIG_SCSI_PM8001=m
 CONFIG_SCSI_PMCRAID=m
 # CONFIG_SCSI_PPA is not set
@@ -4728,7 +4710,6 @@ CONFIG_SECURITY_NETWORK=y
 # CONFIG_SECURITY_PATH is not set
 # CONFIG_SECURITY_SAFESETID is not set
 CONFIG_SECURITY_SELINUX_AVC_STATS=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
 CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
 CONFIG_SECURITY_SELINUX_DEVELOP=y
@@ -5042,7 +5023,6 @@ CONFIG_SND_AU8810=m
 CONFIG_SND_AU8820=m
 CONFIG_SND_AU8830=m
 # CONFIG_SND_AUDIO_GRAPH_CARD is not set
-# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
 # CONFIG_SND_AW2 is not set
 CONFIG_SND_AZT3328=m
 CONFIG_SND_BCD2000=m
@@ -5163,7 +5143,6 @@ CONFIG_SND_SEQUENCER_OSS=m
 CONFIG_SND_SERIAL_U16550=m
 CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_SIMPLE_CARD_UTILS=m
-CONFIG_SND_SIMPLE_SCU_CARD=m
 CONFIG_SND_SIS7019=m
 CONFIG_SND_SOC_AC97_CODEC=m
 # CONFIG_SND_SOC_ADAU1701 is not set
@@ -5799,7 +5778,6 @@ CONFIG_TYPHOON=m
 CONFIG_UBIFS_ATIME_SUPPORT=y
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
 CONFIG_UBIFS_FS_AUTHENTICATION=y
-CONFIG_UBIFS_FS_ENCRYPTION=y
 CONFIG_UBIFS_FS=m
 CONFIG_UBIFS_FS_SECURITY=y
 CONFIG_UBIFS_FS_XATTR=y