| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| From: Greg Kroah-Hartman <gregkh@google.com> |
| Date: Thu, 19 Sep 2019 23:21:24 +0200 |
| Subject: ANDROID: update gki_defconfig |
| |
| The 5.4-rc1-prerelease merge changed a few config options, so update |
| gki_defconfig so that the build will run properly. |
| |
| Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> |
| Change-Id: I8feb0a501d60005a7973b1fa2f9d34bb87b64259 |
| --- |
| arch/arm64/configs/gki_defconfig | 1 - |
| arch/x86/configs/gki_defconfig | 1 - |
| 2 files changed, 2 deletions(-) |
| |
| diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig |
| index f964b81a1e4b..ab1dd6d01ec8 100644 |
| --- a/arch/arm64/configs/gki_defconfig |
| +++ b/arch/arm64/configs/gki_defconfig |
| @@ -397,7 +397,6 @@ CONFIG_HARDENED_USERCOPY=y |
| CONFIG_SECURITY_SELINUX=y |
| CONFIG_CRYPTO_ADIANTUM=y |
| CONFIG_CRYPTO_MD4=y |
| -CONFIG_CRYPTO_SHA512=y |
| CONFIG_CRYPTO_LZ4=y |
| CONFIG_CRYPTO_ZSTD=y |
| CONFIG_CRYPTO_ANSI_CPRNG=y |
| diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig |
| index 642729662b04..73d513715ce7 100644 |
| --- a/arch/x86/configs/gki_defconfig |
| +++ b/arch/x86/configs/gki_defconfig |
| @@ -328,7 +328,6 @@ CONFIG_SECURITY_NETWORK=y |
| CONFIG_HARDENED_USERCOPY=y |
| CONFIG_SECURITY_SELINUX=y |
| CONFIG_CRYPTO_ADIANTUM=y |
| -CONFIG_CRYPTO_SHA512=y |
| CONFIG_CRYPTO_LZ4=y |
| CONFIG_CRYPTO_ZSTD=y |
| CONFIG_CRYPTO_ANSI_CPRNG=y |
