diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-10-11 21:53:16 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-10-11 21:53:16 +0200 |
commit | cf837b52308690c6e191258beeb87b848bd826d4 (patch) | |
tree | 7f0f62dd436fadb59e2157fbdcb0bba977ea385f | |
parent | 68456add3344dab6d1be07afec844aaed4eb2565 (diff) | |
parent | bb6f824ef6d6471ed1ba20779cdbd252a5936fc6 (diff) | |
download | kernel-cf837b52308690c6e191258beeb87b848bd826d4.tar.gz kernel-cf837b52308690c6e191258beeb87b848bd826d4.tar.xz kernel-cf837b52308690c6e191258beeb87b848bd826d4.zip |
Merge remote-tracking branch 'origin/f30' into f30-user-thl-vanilla-fedora
6 files changed, 12 insertions, 12 deletions
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP b/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP index 98ff565f8..df6a929e2 100644 --- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP +++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP @@ -1 +1 @@ -CONFIG_CRYPTO_DEV_OMAP=m +# CONFIG_CRYPTO_DEV_OMAP is not set diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_AES b/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_AES index 1b126b18e..eb6803b74 100644 --- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_AES +++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_AES @@ -1 +1 @@ -CONFIG_CRYPTO_DEV_OMAP_AES=m +# CONFIG_CRYPTO_DEV_OMAP_AES is not set diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_DES b/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_DES index b359a5c3f..952a6e247 100644 --- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_DES +++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_DES @@ -1 +1 @@ -CONFIG_CRYPTO_DEV_OMAP_DES=m +# CONFIG_CRYPTO_DEV_OMAP_DES is not set diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_SHAM b/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_SHAM index 58d162aba..2997e8fc1 100644 --- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_SHAM +++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_SHAM @@ -1 +1 @@ -CONFIG_CRYPTO_DEV_OMAP_SHAM=m +# CONFIG_CRYPTO_DEV_OMAP_SHAM is not set diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index ea7b2d2b8..4a105466d 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -1142,10 +1142,10 @@ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y CONFIG_CRYPTO_DEV_MARVELL_CESA=m CONFIG_CRYPTO_DEV_MXS_DCP=m # CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set -CONFIG_CRYPTO_DEV_OMAP_AES=m -CONFIG_CRYPTO_DEV_OMAP_DES=m -CONFIG_CRYPTO_DEV_OMAP=m -CONFIG_CRYPTO_DEV_OMAP_SHAM=m +# CONFIG_CRYPTO_DEV_OMAP_AES is not set +# CONFIG_CRYPTO_DEV_OMAP_DES is not set +# CONFIG_CRYPTO_DEV_OMAP is not set +# CONFIG_CRYPTO_DEV_OMAP_SHAM is not set CONFIG_CRYPTO_DEV_QCE=m CONFIG_CRYPTO_DEV_QCOM_RNG=m CONFIG_CRYPTO_DEV_ROCKCHIP=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 3f41496ef..614d53a6c 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -1142,10 +1142,10 @@ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y CONFIG_CRYPTO_DEV_MARVELL_CESA=m CONFIG_CRYPTO_DEV_MXS_DCP=m # CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set -CONFIG_CRYPTO_DEV_OMAP_AES=m -CONFIG_CRYPTO_DEV_OMAP_DES=m -CONFIG_CRYPTO_DEV_OMAP=m -CONFIG_CRYPTO_DEV_OMAP_SHAM=m +# CONFIG_CRYPTO_DEV_OMAP_AES is not set +# CONFIG_CRYPTO_DEV_OMAP_DES is not set +# CONFIG_CRYPTO_DEV_OMAP is not set +# CONFIG_CRYPTO_DEV_OMAP_SHAM is not set CONFIG_CRYPTO_DEV_QCE=m CONFIG_CRYPTO_DEV_QCOM_RNG=m CONFIG_CRYPTO_DEV_ROCKCHIP=m |