summaryrefslogtreecommitdiffstats
path: root/kernel-s390x-debug-fedora.config
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-10-12 15:45:52 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-10-12 15:45:52 +0200
commitd70892345222ea163abe0fdc7cf500be5fd8dfb8 (patch)
tree1b8b3647470b05ddb0522387c86d844b2579011b /kernel-s390x-debug-fedora.config
parented2894a146bfdc68ca0991436ed65dc5d262f83a (diff)
parentaa6d9438d030fa4682d5d450481085c901503da5 (diff)
downloadkernel-d70892345222ea163abe0fdc7cf500be5fd8dfb8.tar.gz
kernel-d70892345222ea163abe0fdc7cf500be5fd8dfb8.tar.xz
kernel-d70892345222ea163abe0fdc7cf500be5fd8dfb8.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-36.vanilla.1.fc34kernel-5.9.0-36.vanilla.1.fc33kernel-5.9.0-36.vanilla.1.fc32kernel-5.9.0-36.vanilla.1.fc31
Diffstat (limited to 'kernel-s390x-debug-fedora.config')
-rw-r--r--kernel-s390x-debug-fedora.config1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 7734d43ee..6ca515b9f 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -1568,6 +1568,7 @@ CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
CONFIG_FAULT_INJECTION=y
# CONFIG_FB_3DFX is not set
# CONFIG_FB_ARK is not set
+# CONFIG_FB_ARMCLCD is not set
# CONFIG_FB_ASILIANT is not set
# CONFIG_FB_ATY128 is not set
# CONFIG_FB_ATY is not set