kernel: Align ARM configuration with remaining architectures

[people/pmueller/ipfire-3.x.git] / kernel / config-x86-generic

diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic
index 2bc7ce05f4e18e321ce88f06e24e561858dce348..6b3ae388d9f5ae5e522fe56c9d99eb6ee980b761 100644 (file)
--- a/kernel/config-x86-generic
+++ b/kernel/config-x86-generic
@@ -187,9 +187,6 @@ CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
 # CONFIG_EFI_MIXED is not set
-# CONFIG_HZ_100 is not set
-CONFIG_HZ_300=y
-CONFIG_HZ=300
 # CONFIG_KEXEC is not set
 # CONFIG_KEXEC_FILE is not set
 CONFIG_CRASH_DUMP=y
@@ -262,7 +259,7 @@ CONFIG_ACPI_HED=y
 CONFIG_ACPI_CUSTOM_METHOD=m
 # CONFIG_ACPI_BGRT is not set
 # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
-CONFIG_ACPI_NFIT=m
+# CONFIG_ACPI_NFIT is not set
 CONFIG_ACPI_APEI=y
 CONFIG_ACPI_APEI_GHES=y
 CONFIG_ACPI_APEI_PCIEAER=y