summaryrefslogtreecommitdiffstats
path: root/kernel-s390x-rhel.config
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-03-07 13:00:26 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2021-03-07 13:00:26 +0100
commitb9facdd0b8e344a224eb690ad84415ec5f04ccd9 (patch)
tree3ff737aa266c3886baf30d42c30875fc331fb74f /kernel-s390x-rhel.config
parent0425873da9e24d7dd3520cba75a6cc7d462b6f53 (diff)
parentd964bc4b81a299df5333f83c5137139b0c098cf6 (diff)
downloadkernel-5.11.4-350.vanilla.1.fc34.tar.gz
kernel-5.11.4-350.vanilla.1.fc34.tar.xz
kernel-5.11.4-350.vanilla.1.fc34.zip
merge origin and update to 5.11.4kernel-5.11.4-350.vanilla.1.fc34
Diffstat (limited to 'kernel-s390x-rhel.config')
-rw-r--r--kernel-s390x-rhel.config3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index c118dbe2f..9d6245ee8 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -684,7 +684,8 @@ CONFIG_CMA_AREAS=7
# CONFIG_CMA_DEBUGFS is not set
# CONFIG_CMA_DEBUG is not set
CONFIG_CMA=y
-CONFIG_CMDLINE=""
+# CONFIG_CMDLINE_EXTEND is not set
+CONFIG_CMDLINE_FROM_BOOTLOADER=y
# CONFIG_CMDLINE_PARTITION is not set
CONFIG_CMM_IUCV=y
CONFIG_CMM=m