diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-05-23 20:59:18 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-05-23 20:59:18 +0200 |
| commit | 32cb0cfe3d51ffc50ac666f3911a232ff90a0aca (patch) | |
| tree | 727940b9020cc1ce0dc675f53af94b3fd3d651d7 /kernel-armv7hl-lpae.config | |
| parent | fbf65ae63f6ded88d126163a8f67dcc5579466ce (diff) | |
| parent | 05f6d3d4a24159235ca49f3a97208ec21e7f4aae (diff) | |
| download | kernel-32cb0cfe3d51ffc50ac666f3911a232ff90a0aca.tar.gz kernel-32cb0cfe3d51ffc50ac666f3911a232ff90a0aca.tar.xz kernel-32cb0cfe3d51ffc50ac666f3911a232ff90a0aca.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to 'kernel-armv7hl-lpae.config')
| -rw-r--r-- | kernel-armv7hl-lpae.config | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 8e5372822..6a0310d97 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -1112,8 +1112,8 @@ CONFIG_CRYPTO_DEV_S5P=m CONFIG_CRYPTO_DEV_STM32_CRC=m CONFIG_CRYPTO_DEV_STM32_CRYP=m CONFIG_CRYPTO_DEV_STM32_HASH=m -# CONFIG_CRYPTO_DEV_SUN4I_SS is not set -# CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG is not set +CONFIG_CRYPTO_DEV_SUN4I_SS=m +CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y CONFIG_CRYPTO_DEV_VIRTIO=m CONFIG_CRYPTO_DH=y CONFIG_CRYPTO_DRBG_CTR=y @@ -2508,6 +2508,7 @@ CONFIG_INPUT_PWM_BEEPER=m CONFIG_INPUT_RK805_PWRKEY=m CONFIG_INPUT_SOC_BUTTON_ARRAY=m CONFIG_INPUT_SPARSEKMAP=m +CONFIG_INPUT_STPMIC1_ONKEY=m CONFIG_INPUT_TABLET=y CONFIG_INPUT_TOUCHSCREEN=y CONFIG_INPUT_UINPUT=m @@ -3317,7 +3318,7 @@ CONFIG_MFD_STM32_LPTIMER=m CONFIG_MFD_STM32_TIMERS=m # CONFIG_MFD_STMFX is not set # CONFIG_MFD_STMPE is not set -# CONFIG_MFD_STPMIC1 is not set +CONFIG_MFD_STPMIC1=m CONFIG_MFD_SUN4I_GPADC=m CONFIG_MFD_SUN6I_PRCM=y CONFIG_MFD_SYSCON=y @@ -4800,6 +4801,7 @@ CONFIG_REGULATOR_S2MPS11=m CONFIG_REGULATOR_S5M8767=m CONFIG_REGULATOR_STM32_PWR=y CONFIG_REGULATOR_STM32_VREFBUF=m +CONFIG_REGULATOR_STPMIC1=m CONFIG_REGULATOR_SY8106A=m CONFIG_REGULATOR_TPS51632=m CONFIG_REGULATOR_TPS62360=m @@ -6071,6 +6073,7 @@ CONFIG_STMMAC_ETH=m # CONFIG_STMMAC_PCI is not set CONFIG_STMMAC_PLATFORM=m # CONFIG_STMPE_ADC is not set +CONFIG_STPMIC1_WATCHDOG=m CONFIG_STRICT_DEVMEM=y CONFIG_STRICT_KERNEL_RWX=y CONFIG_STRICT_MODULE_RWX=y |