summaryrefslogtreecommitdiffstats
path: root/kernel-s390x-debug-fedora.config
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-06-15 05:42:19 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-06-15 05:42:19 +0200
commitd0b8941357b7ce0c26d19376bc4d827042d6bb12 (patch)
tree61138493dd96ee303830bc148d607fb915562b77 /kernel-s390x-debug-fedora.config
parentf7ab3f33fe442b453cab73ec62b87ea9a757e0c7 (diff)
parentdadba4a34d797d91b5524e2ea22dc6374a2d85b1 (diff)
downloadkernel-d0b8941357b7ce0c26d19376bc4d827042d6bb12.tar.gz
kernel-d0b8941357b7ce0c26d19376bc4d827042d6bb12.tar.xz
kernel-d0b8941357b7ce0c26d19376bc4d827042d6bb12.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc1.1.vanilla.1.fc33kernel-5.8.0-0.rc1.1.vanilla.1.fc32kernel-5.8.0-0.rc1.1.vanilla.1.fc31
Diffstat (limited to 'kernel-s390x-debug-fedora.config')
-rw-r--r--kernel-s390x-debug-fedora.config3
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 854083ff4..8ed6784d5 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -2031,6 +2031,7 @@ CONFIG_I2C_NVIDIA_GPU=m
# CONFIG_I2C_OCORES is not set
# CONFIG_I2C_PCA_PLATFORM is not set
# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_QCOM_CCI is not set
# CONFIG_I2C_RK3X is not set
# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
CONFIG_I2C_SI470X=m
@@ -2613,6 +2614,7 @@ CONFIG_KEYBOARD_QT1070=m
CONFIG_KEYBOARD_TM2_TOUCHKEY=m
# CONFIG_KEYBOARD_XTKBD is not set
CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_KEY_NOTIFICATIONS=y
CONFIG_KEYS_REQUEST_CACHE=y
CONFIG_KEYS=y
CONFIG_KGDB_KDB=y
@@ -6526,6 +6528,7 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0
# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
CONFIG_WATCHDOG_SYSFS=y
CONFIG_WATCHDOG=y
+CONFIG_WATCH_QUEUE=y
# CONFIG_WCN36XX_DEBUGFS is not set
CONFIG_WCN36XX=m
CONFIG_WDAT_WDT=m