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 /configs | |
| 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 'configs')
6 files changed, 6 insertions, 2 deletions
diff --git a/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_SUN4I_SS b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_SUN4I_SS index 586ef08db..957fb4e1d 100644 --- a/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_SUN4I_SS +++ b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_SUN4I_SS @@ -1 +1 @@ -# CONFIG_CRYPTO_DEV_SUN4I_SS is not set +CONFIG_CRYPTO_DEV_SUN4I_SS=m diff --git a/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG index d55f95cdc..62fd0b85a 100644 --- a/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG +++ b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG @@ -1 +1 @@ -# CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG is not set +CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y diff --git a/configs/fedora/generic/arm/armv7/CONFIG_INPUT_STPMIC1_ONKEY b/configs/fedora/generic/arm/armv7/CONFIG_INPUT_STPMIC1_ONKEY new file mode 100644 index 000000000..c64eca927 --- /dev/null +++ b/configs/fedora/generic/arm/armv7/CONFIG_INPUT_STPMIC1_ONKEY @@ -0,0 +1 @@ +CONFIG_INPUT_STPMIC1_ONKEY=m diff --git a/configs/fedora/generic/arm/armv7/CONFIG_MFD_STPMIC1 b/configs/fedora/generic/arm/armv7/CONFIG_MFD_STPMIC1 new file mode 100644 index 000000000..76953e1df --- /dev/null +++ b/configs/fedora/generic/arm/armv7/CONFIG_MFD_STPMIC1 @@ -0,0 +1 @@ +CONFIG_MFD_STPMIC1=m diff --git a/configs/fedora/generic/arm/armv7/CONFIG_REGULATOR_STPMIC1 b/configs/fedora/generic/arm/armv7/CONFIG_REGULATOR_STPMIC1 new file mode 100644 index 000000000..3c0492dbd --- /dev/null +++ b/configs/fedora/generic/arm/armv7/CONFIG_REGULATOR_STPMIC1 @@ -0,0 +1 @@ +CONFIG_REGULATOR_STPMIC1=m diff --git a/configs/fedora/generic/arm/armv7/CONFIG_STPMIC1_WATCHDOG b/configs/fedora/generic/arm/armv7/CONFIG_STPMIC1_WATCHDOG new file mode 100644 index 000000000..faa20a811 --- /dev/null +++ b/configs/fedora/generic/arm/armv7/CONFIG_STPMIC1_WATCHDOG @@ -0,0 +1 @@ +CONFIG_STPMIC1_WATCHDOG=m |