summaryrefslogtreecommitdiffstats
path: root/kernel-s390x.config
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2017-09-13 08:41:54 +0100
committerPeter Robinson <pbrobinson@gmail.com>2017-09-13 08:41:54 +0100
commita0a9c7d7205b06947752fd1ab34502c3aa5ba50f (patch)
treea2f8181a4fc95f104587dc0eeb0f288b489fff17 /kernel-s390x.config
parentb4668f245f4965cc754efce0321172fcb4067895 (diff)
downloadkernel-a0a9c7d7205b06947752fd1ab34502c3aa5ba50f.tar.gz
kernel-a0a9c7d7205b06947752fd1ab34502c3aa5ba50f.tar.xz
kernel-a0a9c7d7205b06947752fd1ab34502c3aa5ba50f.zip
initial ARM fixes and bits for 4.13 stable rebase
Diffstat (limited to 'kernel-s390x.config')
-rw-r--r--kernel-s390x.config3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config
index c1c98195e..382b67636 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -2726,7 +2726,6 @@ CONFIG_MMC_SDHCI=m
# CONFIG_MMC_SDHCI_OF_ARASAN is not set
# 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_XENON=m
@@ -3652,7 +3651,7 @@ CONFIG_PWM_HIBVT=m
# CONFIG_PWM is not set
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWRSEQ_EMMC=m
-# CONFIG_PWRSEQ_SD8787 is not set
+CONFIG_PWRSEQ_SD8787=m
CONFIG_PWRSEQ_SIMPLE=m
# CONFIG_QCA7000 is not set
# CONFIG_QCA7000_SPI is not set