From 0805625aea4a35fb8aae0c37e06da6921e8029ac Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Mon, 20 Nov 2017 10:00:57 -0800 Subject: Linux v4.14-12891-gc8a0739b185d Also turn off a powerpc crypto drive that was failing to compile --- kernel-ppc64.config | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'kernel-ppc64.config') diff --git a/kernel-ppc64.config b/kernel-ppc64.config index da6e3e97a..1857e1f19 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -853,7 +853,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=y +# CONFIG_CRYPTO_DEV_NX is not set # CONFIG_CRYPTO_DEV_SP_CCP is not set CONFIG_CRYPTO_DEV_VIRTIO=m CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m @@ -1580,6 +1580,7 @@ CONFIG_GREENASIA_FF=y # CONFIG_GREYBUS is not set # CONFIG_GS_FPGABOOT is not set CONFIG_GTP=m +# CONFIG_GUP_BENCHMARK is not set CONFIG_HAMACHI=m CONFIG_HAMRADIO=y CONFIG_HANGCHECK_TIMER=m @@ -1783,7 +1784,7 @@ CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TPM=m CONFIG_HW_RANDOM_VIRTIO=m CONFIG_HW_RANDOM=y -CONFIG_HWSPINLOCK=m +CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set CONFIG_HYSDN_CAPI=y CONFIG_HYSDN=m @@ -3556,6 +3557,7 @@ CONFIG_NS83820=m CONFIG_NSC_FIR=m CONFIG_NTB_IDT=m # CONFIG_NTB is not set +CONFIG_NTB_SWITCHTEC=m # CONFIG_NTFS_FS is not set CONFIG_NTP_PPS=y CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y @@ -4038,6 +4040,7 @@ CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPMSG_CHAR is not set # CONFIG_RPMSG_QCOM_GLINK_RPM is not set # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set +CONFIG_RPMSG_VIRTIO=m CONFIG_RPR0521=m CONFIG_RSI_91X=m CONFIG_RSI_DEBUGFS=y @@ -5113,6 +5116,7 @@ CONFIG_TERANETICS_PHY=m CONFIG_TEST_ASYNC_DRIVER_PROBE=m # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BPF is not set +# CONFIG_TEST_FIND_BIT is not set # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set -- cgit