From: Seth Forshee Date: Wed, 30 Aug 2017 19:29:09 +0000 (-0500) Subject: UBUNTU: [Config] CONFIG_CRYPTO_DEV_NITROX_CNN55XX=n for s390x X-Git-Tag: Ubuntu-4.13.0-10.11~73 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=265303d776b69e05d470629c891d99b1e5134569;p=mirror_ubuntu-artful-kernel.git UBUNTU: [Config] CONFIG_CRYPTO_DEV_NITROX_CNN55XX=n for s390x Signed-off-by: Seth Forshee --- diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 87b9a8c6b17d..c70e0a97ecab 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -73,6 +73,7 @@ CONFIG_CMA=y CONFIG_CMDLINE_PARTITION=y CONFIG_CRAMFS=m # CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC is not set +CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m # CONFIG_CXL_AFU_DRIVER_OPS is not set # CONFIG_CXL_BASE is not set # CONFIG_CXL_LIB is not set diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index 090204cae5c5..221cd29c7353 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -84,6 +84,7 @@ CONFIG_CMDLINE_PARTITION=y CONFIG_CRAMFS=m CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC=m # CONFIG_CRYPTO_DEV_FSL_CAAM_IMX is not set +CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m # CONFIG_CXL_AFU_DRIVER_OPS is not set # CONFIG_CXL_BASE is not set # CONFIG_CXL_LIB is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index d9615b264f74..f334ff3808c6 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -1789,7 +1789,6 @@ CONFIG_CRYPTO_DEV_MV_CESA=m CONFIG_CRYPTO_DEV_MXC_SCC=m # CONFIG_CRYPTO_DEV_MXS_DCP is not set CONFIG_CRYPTO_DEV_NITROX=m -CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m CONFIG_CRYPTO_DEV_NX=y CONFIG_CRYPTO_DEV_NX_COMPRESS=m CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index 7b320a32c2b3..3d69349255ae 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -73,6 +73,7 @@ CONFIG_CMM=m # CONFIG_CPU_BIG_ENDIAN is not set CONFIG_CRAMFS=m # CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC is not set +CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m CONFIG_CXL_AFU_DRIVER_OPS=y CONFIG_CXL_BASE=y CONFIG_CXL_LIB=y diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x index 055fb6763069..9c8a5b9b5e82 100644 --- a/debian.master/config/s390x/config.common.s390x +++ b/debian.master/config/s390x/config.common.s390x @@ -60,6 +60,7 @@ CONFIG_CMM=y CONFIG_CPU_BIG_ENDIAN=y # CONFIG_CRAMFS is not set # CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC is not set +# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set # CONFIG_CXL_AFU_DRIVER_OPS is not set # CONFIG_CXL_BASE is not set # CONFIG_CXL_LIB is not set