summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--changelog1
-rw-r--r--src/build/linux-libre-4.19_4.19.167+gnu/config2
2 files changed, 1 insertions, 2 deletions
diff --git a/changelog b/changelog
index 582e4ba..b5ec90e 100644
--- a/changelog
+++ b/changelog
@@ -5,7 +5,6 @@ config-x60 (2.8) trunk
* config-linux-libre-x60: Drop package.
* config-linux-libre-4.19-x60: Enable DMI scanning (needed by
ThinkPad ACPI driver).
- * config-linux-libre-4.19-x60: Override command line.
* config-linux-libre-4.19-x60: Disable ACPI PCI Hotplug driver and IBM
extensions (fixes "acpiphp_ibm: ibm_acpiphp_init:
acpi_walk_namespace failed" error at boot).
diff --git a/src/build/linux-libre-4.19_4.19.167+gnu/config b/src/build/linux-libre-4.19_4.19.167+gnu/config
index c81b225..bcf9abe 100644
--- a/src/build/linux-libre-4.19_4.19.167+gnu/config
+++ b/src/build/linux-libre-4.19_4.19.167+gnu/config
@@ -346,7 +346,7 @@ CONFIG_HOTPLUG_CPU=y
# CONFIG_COMPAT_VDSO is not set
CONFIG_CMDLINE_BOOL=y
CONFIG_CMDLINE="rw mce=0 page_poison=1 pti=on spectre_v2=off quiet"
-CONFIG_CMDLINE_OVERRIDE=y
+# CONFIG_CMDLINE_OVERRIDE is not set
# CONFIG_MODIFY_LDT_SYSCALL is not set
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y