diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-01-22 21:26:35 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-01-22 21:26:35 +0100 |
| commit | ea45b19f98979e52a2ed1c03364dd54e8bb613fb (patch) | |
| tree | 7a7405daf1cad5e7d7ecc164c34938204de38ecc | |
| parent | 3e6625b09fd8dc9c2d0167316f60f52030366a11 (diff) | |
| parent | 4c7c358c38e94d1ccbc1f848e6cb98711fa9284c (diff) | |
| download | kernel-ea45b19f98979e52a2ed1c03364dd54e8bb613fb.tar.gz kernel-ea45b19f98979e52a2ed1c03364dd54e8bb613fb.tar.xz kernel-ea45b19f98979e52a2ed1c03364dd54e8bb613fb.zip | |
Merge remote-tracking branch 'origin/stabilization' into stabilization-user-thl-vanilla-fedora
| -rw-r--r-- | configs/fedora/generic/powerpc/CONFIG_CRYPTO_DEV_NX | 2 | ||||
| -rw-r--r-- | kernel-ppc64le-debug.config | 2 | ||||
| -rw-r--r-- | kernel-ppc64le.config | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/configs/fedora/generic/powerpc/CONFIG_CRYPTO_DEV_NX b/configs/fedora/generic/powerpc/CONFIG_CRYPTO_DEV_NX index 47b9dbe8a..fd145f04f 100644 --- a/configs/fedora/generic/powerpc/CONFIG_CRYPTO_DEV_NX +++ b/configs/fedora/generic/powerpc/CONFIG_CRYPTO_DEV_NX @@ -1 +1 @@ -# CONFIG_CRYPTO_DEV_NX is not set +CONFIG_CRYPTO_DEV_NX=y diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index d11b745e4..a761d7b0f 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -873,7 +873,7 @@ CONFIG_CRYPTO_DEV_NX_COMPRESS=m CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m CONFIG_CRYPTO_DEV_NX_ENCRYPT=m -# CONFIG_CRYPTO_DEV_NX is not set +CONFIG_CRYPTO_DEV_NX=y # CONFIG_CRYPTO_DEV_SP_CCP is not set CONFIG_CRYPTO_DEV_VIRTIO=m CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 106972b92..8718ac190 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -872,7 +872,7 @@ CONFIG_CRYPTO_DEV_NX_COMPRESS=m CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m CONFIG_CRYPTO_DEV_NX_ENCRYPT=m -# CONFIG_CRYPTO_DEV_NX is not set +CONFIG_CRYPTO_DEV_NX=y # CONFIG_CRYPTO_DEV_SP_CCP is not set CONFIG_CRYPTO_DEV_VIRTIO=m CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m |