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-x86_64-rhel.config | |
| parent | f7ab3f33fe442b453cab73ec62b87ea9a757e0c7 (diff) | |
| parent | dadba4a34d797d91b5524e2ea22dc6374a2d85b1 (diff) | |
| download | kernel-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-x86_64-rhel.config')
| -rw-r--r-- | kernel-x86_64-rhel.config | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 110358aaf..14b687547 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -1996,6 +1996,7 @@ CONFIG_I2C_PARPORT_LIGHT=m CONFIG_I2C_PARPORT=m CONFIG_I2C_PCA_PLATFORM=m CONFIG_I2C_PIIX4=m +# CONFIG_I2C_QCOM_CCI is not set # CONFIG_I2C_RK3X is not set # CONFIG_I2C_ROBOTFUZZ_OSIF is not set CONFIG_I2C_SCMI=m @@ -6204,6 +6205,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=m CONFIG_WDTPCI=m |