diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2017-09-13 08:41:54 +0100 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2017-09-13 08:41:54 +0100 |
| commit | a0a9c7d7205b06947752fd1ab34502c3aa5ba50f (patch) | |
| tree | a2f8181a4fc95f104587dc0eeb0f288b489fff17 /kernel-armv7hl.config | |
| parent | b4668f245f4965cc754efce0321172fcb4067895 (diff) | |
| download | kernel-a0a9c7d7205b06947752fd1ab34502c3aa5ba50f.tar.gz kernel-a0a9c7d7205b06947752fd1ab34502c3aa5ba50f.tar.xz kernel-a0a9c7d7205b06947752fd1ab34502c3aa5ba50f.zip | |
initial ARM fixes and bits for 4.13 stable rebase
Diffstat (limited to 'kernel-armv7hl.config')
| -rw-r--r-- | kernel-armv7hl.config | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index e5f7f1f40..e1925a121 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -1066,7 +1066,7 @@ CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_FIPS=y CONFIG_CRYPTO_GCM=m CONFIG_CRYPTO_GF128MUL=y -# CONFIG_CRYPTO_GHASH_ARM_CE is not set +CONFIG_CRYPTO_GHASH_ARM_CE=m CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_HW=y @@ -3285,7 +3285,6 @@ 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 is not set # CONFIG_MMC_MTK is not set CONFIG_MMC_MVSDIO=m @@ -3306,8 +3305,7 @@ CONFIG_MMC_SDHCI=m 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_OF_ESDHC=m CONFIG_MMC_SDHCI_PCI=m CONFIG_MMC_SDHCI_PLTFM=m CONFIG_MMC_SDHCI_PXAV2=m @@ -3329,6 +3327,7 @@ CONFIG_MMC_USHC=m CONFIG_MMC_VIA_SDMMC=m CONFIG_MMC_VUB300=m CONFIG_MMC_WBSD=m +CONFIG_MMC=y CONFIG_MMP_PDMA=y CONFIG_MMP_TDMA=y CONFIG_MMU=y @@ -4483,9 +4482,9 @@ CONFIG_PWM_TIPWMSS=y CONFIG_PWM_TWL_LED=m CONFIG_PWM_TWL=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_PXA_DMA=y # CONFIG_QCA7000 is not set # CONFIG_QCA7000_SPI is not set |