From a0a9c7d7205b06947752fd1ab34502c3aa5ba50f Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 13 Sep 2017 08:41:54 +0100 Subject: initial ARM fixes and bits for 4.13 stable rebase --- kernel-aarch64-debug.config | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'kernel-aarch64-debug.config') diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 284b9400c..968aa7b52 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -1015,6 +1015,7 @@ CONFIG_CRYPTO_FIPS=y CONFIG_CRYPTO_GCM=m CONFIG_CRYPTO_GF128MUL=y CONFIG_CRYPTO_GHASH_ARM64_CE=m +CONFIG_CRYPTO_GHASH_ARM_CE=m CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_HW=y @@ -1320,7 +1321,6 @@ CONFIG_DRM_SIL_SII8620=m # CONFIG_DRM_SIS is not set # CONFIG_DRM_STM is not set CONFIG_DRM_SUN4I_BACKEND=m -CONFIG_DRM_SUN4I_HDMI=m CONFIG_DRM_SUN8I_MIXER=m # CONFIG_DRM_TDFX is not set # CONFIG_DRM_TEGRA_DEBUG is not set @@ -3104,11 +3104,10 @@ CONFIG_MMC_DW=m CONFIG_MMC_DW_PCI=m CONFIG_MMC_DW_PLTFM=m CONFIG_MMC_DW_ROCKCHIP=m -CONFIG_MMC=m CONFIG_MMC_MESON_GX=m # CONFIG_MMC_MTK is not set CONFIG_MMC_MVSDIO=m -# CONFIG_MMC_QCOM_DML is not set +CONFIG_MMC_QCOM_DML=m CONFIG_MMC_REALTEK_PCI=m CONFIG_MMC_REALTEK_USB=m CONFIG_MMC_RICOH_MMC=y @@ -3121,7 +3120,6 @@ CONFIG_MMC_SDHCI_MSM=m CONFIG_MMC_SDHCI_OF_ARASAN=m # CONFIG_MMC_SDHCI_OF_AT91 is not set # CONFIG_MMC_SDHCI_OF_ESDHC is not set -# CONFIG_MMC_SDHCI_OF is not set CONFIG_MMC_SDHCI_PCI=m CONFIG_MMC_SDHCI_PLTFM=m CONFIG_MMC_SDHCI_PXAV3=m @@ -3138,6 +3136,7 @@ CONFIG_MMC_USHC=m CONFIG_MMC_VIA_SDMMC=m CONFIG_MMC_VUB300=m CONFIG_MMC_WBSD=m +CONFIG_MMC=y CONFIG_MMIOTRACE=y CONFIG_MMU=y # CONFIG_MODULE_COMPRESS is not set @@ -4183,9 +4182,9 @@ CONFIG_PWM_SUN4I=m CONFIG_PWM_SYSFS=y CONFIG_PWM_TEGRA=m CONFIG_PWM=y -CONFIG_PWRSEQ_EMMC=m -# CONFIG_PWRSEQ_SD8787 is not set -CONFIG_PWRSEQ_SIMPLE=m +CONFIG_PWRSEQ_EMMC=y +CONFIG_PWRSEQ_SD8787=m +CONFIG_PWRSEQ_SIMPLE=y # CONFIG_QCA7000 is not set # CONFIG_QCA7000_SPI is not set # CONFIG_QCA7000_UART is not set -- cgit