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-armv7hl-fedora.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-armv7hl-fedora.config')
| -rw-r--r-- | kernel-armv7hl-fedora.config | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 8aa49def2..71f92b1b4 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -2485,6 +2485,7 @@ CONFIG_I2C_AMD_MP2=m CONFIG_I2C_ARB_GPIO_CHALLENGE=m CONFIG_I2C_BCM2835=m CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_BRCMSTB=y CONFIG_I2C_CADENCE=m # CONFIG_I2C_CBUS_GPIO is not set CONFIG_I2C_CHARDEV=m @@ -2533,6 +2534,7 @@ CONFIG_I2C_PCA_PLATFORM=m # CONFIG_I2C_PIIX4 is not set CONFIG_I2C_PXA=m # CONFIG_I2C_PXA_SLAVE is not set +# CONFIG_I2C_QCOM_CCI is not set CONFIG_I2C_QUP=m CONFIG_I2C_RK3X=y # CONFIG_I2C_ROBOTFUZZ_OSIF is not set @@ -3192,6 +3194,7 @@ CONFIG_KEYBOARD_TM2_TOUCHKEY=m CONFIG_KEYBOARD_TWL4030=m # CONFIG_KEYBOARD_XTKBD is not set CONFIG_KEY_DH_OPERATIONS=y +CONFIG_KEY_NOTIFICATIONS=y CONFIG_KEYS_REQUEST_CACHE=y # CONFIG_KEYSTONE_REMOTEPROC is not set CONFIG_KEYS=y @@ -8039,6 +8042,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 |