diff --git a/kernel/config-5.4.x-aarch64 b/kernel/config-5.4.x-aarch64
index 26c95bcde..77f9e873b 100644
--- a/kernel/config-5.4.x-aarch64
+++ b/kernel/config-5.4.x-aarch64
@@ -23,7 +23,6 @@ CONFIG_THREAD_INFO_IN_TASK=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
-# CONFIG_HEADER_TEST is not set
 CONFIG_LOCALVERSION="-linuxkit"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
diff --git a/kernel/config-5.4.x-s390x b/kernel/config-5.4.x-s390x
index 9c506114e..c63399334 100644
--- a/kernel/config-5.4.x-s390x
+++ b/kernel/config-5.4.x-s390x
@@ -23,7 +23,6 @@ CONFIG_THREAD_INFO_IN_TASK=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
-# CONFIG_HEADER_TEST is not set
 CONFIG_LOCALVERSION="-linuxkit"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
diff --git a/kernel/config-5.4.x-x86_64 b/kernel/config-5.4.x-x86_64
index dac75d91f..f5e1df64c 100644
--- a/kernel/config-5.4.x-x86_64
+++ b/kernel/config-5.4.x-x86_64
@@ -23,7 +23,6 @@ CONFIG_THREAD_INFO_IN_TASK=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
-# CONFIG_HEADER_TEST is not set
 CONFIG_LOCALVERSION="-linuxkit"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
@@ -1669,8 +1668,6 @@ CONFIG_ALLOW_DEV_COREDUMP=y
 CONFIG_SYS_HYPERVISOR=y
 CONFIG_GENERIC_CPU_AUTOPROBE=y
 CONFIG_GENERIC_CPU_VULNERABILITIES=y
-CONFIG_REGMAP=y
-CONFIG_REGMAP_I2C=y
 # end of Generic Driver Options
 
 #
@@ -3488,7 +3485,6 @@ CONFIG_INTEL_IPS=y
 # CONFIG_INTEL_PMC_IPC is not set
 # CONFIG_SURFACE_PRO3_BUTTON is not set
 # CONFIG_INTEL_PUNIT_IPC is not set
-# CONFIG_MLX_PLATFORM is not set
 # CONFIG_INTEL_TURBO_MAX_3 is not set
 # CONFIG_I2C_MULTI_INSTANTIATE is not set