summaryrefslogtreecommitdiffstats
path: root/kernel-s390x-fedora.config
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-07-14 06:58:26 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2021-07-14 06:58:26 +0200
commit7fab7d503cf3c9388db6779c203de2670789da4a (patch)
treeb8eb9fe3f00bca71e36ac5357acc9c349bf8e4f6 /kernel-s390x-fedora.config
parent8f3f0017691ec9ec0adb94b92084fc1f402df95c (diff)
parent58f461d452ca71855ab4a53cf6d36eb8ab1a818f (diff)
downloadkernel-5.14.0-0.rc1.20210713git7fef2edf7cc7.18.vanilla.1.fc35.tar.gz
kernel-5.14.0-0.rc1.20210713git7fef2edf7cc7.18.vanilla.1.fc35.tar.xz
kernel-5.14.0-0.rc1.20210713git7fef2edf7cc7.18.vanilla.1.fc35.zip
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.14.0-0.rc1.20210713git7fef2edf7cc7.18.vanilla.1.fc35
Diffstat (limited to 'kernel-s390x-fedora.config')
-rw-r--r--kernel-s390x-fedora.config4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index e8c79c229..2d008e360 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -207,7 +207,7 @@ CONFIG_AMD_PHY=m
CONFIG_AMD_PMC=m
# CONFIG_AMDTEE is not set
# CONFIG_AMD_XGBE_DCB is not set
-CONFIG_AMIGA_PARTITION=y
+# CONFIG_AMIGA_PARTITION is not set
# CONFIG_ANDROID is not set
# CONFIG_APDS9300 is not set
# CONFIG_APDS9802ALS is not set
@@ -2761,7 +2761,7 @@ CONFIG_JOYSTICK_XPAD=m
CONFIG_JUMP_LABEL=y
CONFIG_KALLSYMS_ALL=y
CONFIG_KALLSYMS=y
-CONFIG_KARMA_PARTITION=y
+# CONFIG_KARMA_PARTITION is not set
# CONFIG_KASAN is not set
# CONFIG_KASAN_MODULE_TEST is not set
# CONFIG_KASAN_VMALLOC is not set