X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=5.4%2Fx86-32-nonpae;h=cea128a3b22b00f94742ecfb9f10f3228e4abd2f;hb=6b2afa3eece40899620a1ace4fa135c93bb3754b;hp=217ecf0743af594b924d4da07582481a827433a6;hpb=118bf03ebfe34e42c030b9f8176b867cd64b521c;p=kernel-configs.git

diff --git a/5.4/x86-32-nonpae b/5.4/x86-32-nonpae
index 217ecf0..cea128a 100644
--- a/5.4/x86-32-nonpae
+++ b/5.4/x86-32-nonpae
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.4.254-gnu1 Kernel Configuration
+# Linux/i386 5.4.258-gnu1 Kernel Configuration
 #
 
 #
@@ -1613,8 +1613,6 @@ CONFIG_NET_CLS_FW=m
 CONFIG_NET_CLS_U32=m
 # CONFIG_CLS_U32_PERF is not set
 CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_CLS_FLOW=m
 CONFIG_NET_CLS_CGROUP=m
 CONFIG_NET_CLS_BPF=m
@@ -8690,7 +8688,6 @@ CONFIG_QCOM_VADC_COMMON=m
 CONFIG_QCOM_SPMI_IADC=m
 CONFIG_QCOM_SPMI_VADC=m
 CONFIG_QCOM_SPMI_ADC5=m
-CONFIG_STX104=m
 CONFIG_TI_ADC081C=m
 CONFIG_TI_ADC0832=m
 CONFIG_TI_ADC084S021=m
@@ -8708,6 +8705,12 @@ CONFIG_VIPERBOARD_ADC=m
 CONFIG_XILINX_XADC=m
 # end of Analog to digital converters
 
+#
+# Analog to digital and digital to analog converters
+#
+CONFIG_STX104=m
+# end of Analog to digital and digital to analog converters
+
 #
 # Analog Front Ends
 #
@@ -9664,7 +9667,6 @@ CONFIG_IMA_APPRAISE=y
 # CONFIG_IMA_APPRAISE_BUILD_POLICY is not set
 CONFIG_IMA_APPRAISE_BOOTPARAM=y
 # CONFIG_IMA_APPRAISE_MODSIG is not set
-CONFIG_IMA_TRUSTED_KEYRING=y
 # CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set
 # CONFIG_IMA_BLACKLIST_KEYRING is not set
 # CONFIG_IMA_LOAD_X509 is not set