X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=5.4%2Farmhf;h=15c82db8a266b702071c069fbd90dad8ab88f685;hb=96f72fae57373690e8869950726ea65d3ed16a85;hp=54ee2a5ea90479df569d148ce7e2885e9aaf3e00;hpb=a469ce0330ed950cf7ccb4e8485810d0b4f92a63;p=kernel-configs.git

diff --git a/5.4/armhf b/5.4/armhf
index 54ee2a5..15c82db 100644
--- a/5.4/armhf
+++ b/5.4/armhf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.4.191-gnu1 Kernel Configuration
+# Linux/arm 5.4.197-gnu1 Kernel Configuration
 #
 
 #
@@ -624,7 +624,6 @@ CONFIG_SCHED_HRTICK=y
 CONFIG_ARM_PATCH_IDIV=y
 CONFIG_AEABI=y
 # CONFIG_OABI_COMPAT is not set
-CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
 CONFIG_HAVE_ARCH_PFN_VALID=y
 CONFIG_HIGHMEM=y
 CONFIG_HIGHPTE=y
@@ -3906,9 +3905,6 @@ CONFIG_MISDN_NETJET=m
 CONFIG_MISDN_HDLC=m
 CONFIG_MISDN_IPAC=m
 CONFIG_MISDN_ISAR=m
-CONFIG_NVM=y
-CONFIG_NVM_PBLK=m
-# CONFIG_NVM_PBLK_DEBUG is not set
 
 #
 # Input device support