diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-15 05:42:19 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-15 05:42:19 +0200 |
| commit | d0b8941357b7ce0c26d19376bc4d827042d6bb12 (patch) | |
| tree | 61138493dd96ee303830bc148d607fb915562b77 /kernel-s390x-rhel.config | |
| parent | f7ab3f33fe442b453cab73ec62b87ea9a757e0c7 (diff) | |
| parent | dadba4a34d797d91b5524e2ea22dc6374a2d85b1 (diff) | |
| download | kernel-5.8.0-0.rc1.1.vanilla.1.fc31.tar.gz kernel-5.8.0-0.rc1.1.vanilla.1.fc31.tar.xz kernel-5.8.0-0.rc1.1.vanilla.1.fc31.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-rhel.config')
| -rw-r--r-- | kernel-s390x-rhel.config | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 8fee7620d..928e00f52 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -1845,6 +1845,7 @@ CONFIG_I2C_MUX_MLXCPLD=m # CONFIG_I2C_PARPORT_LIGHT 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_SIMTEC is not set @@ -5938,6 +5939,7 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set CONFIG_WATCHDOG_SYSFS=y CONFIG_WATCHDOG=y +# CONFIG_WATCH_QUEUE is not set # CONFIG_WCN36XX is not set # CONFIG_WDAT_WDT is not set # CONFIG_WDTPCI is not set |