diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-09-12 07:21:24 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-09-12 07:21:24 +0200 |
commit | f7c6ba2e5510e3847bb6908b5869c7a812ac2515 (patch) | |
tree | 1c29b736671852fece0089b3b8b612734cff27ad /kernel-i686-PAE.config | |
parent | c96c76cfa4bd24afc66ce71fc0ebf4c73279f0bf (diff) | |
parent | e19dd18c383ac8a604b14cb66940b901562f082e (diff) | |
download | kernel-4.14.0-0.rc0.git4.1.vanilla.knurd.1.fc27.tar.gz kernel-4.14.0-0.rc0.git4.1.vanilla.knurd.1.fc27.tar.xz kernel-4.14.0-0.rc0.git4.1.vanilla.knurd.1.fc27.zip |
Merge remote-tracking branch 'origin/master'kernel-4.14.0-0.rc0.git4.1.vanilla.knurd.1.fc28kernel-4.14.0-0.rc0.git4.1.vanilla.knurd.1.fc27kernel-4.14.0-0.rc0.git4.1.vanilla.knurd.1.fc26kernel-4.14.0-0.rc0.git4.1.vanilla.knurd.1.fc25
Diffstat (limited to 'kernel-i686-PAE.config')
-rw-r--r-- | kernel-i686-PAE.config | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index e663c66b9..61c981a38 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -390,6 +390,7 @@ CONFIG_BATMAN_ADV_NC=y # CONFIG_BATTERY_LEGO_EV3 is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_MAX1721X is not set CONFIG_BATTERY_OLPC=y # CONFIG_BATTERY_SBS is not set CONFIG_BAYCOM_EPP=m @@ -3025,7 +3026,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 @@ -4034,12 +4034,13 @@ CONFIG_PWM_LPSS_PLATFORM=m # CONFIG_PWM_PCA9685 is not set CONFIG_PWM=y 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 # CONFIG_QCA7000_UART is not set # CONFIG_QCOM_EMAC is not set +# CONFIG_QCOM_GLINK_SSR is not set # CONFIG_QCOM_HIDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set CONFIG_QEDE=m @@ -4154,6 +4155,7 @@ CONFIG_RELAY=y CONFIG_RELOCATABLE=y CONFIG_REMOTEPROC=m CONFIG_RESET_ATTACK_MITIGATION=y +# CONFIG_RESET_HSDK_V1 is not set # CONFIG_RESET_TI_SYSCON is not set # CONFIG_RFD_FTL is not set CONFIG_RFKILL_GPIO=m @@ -4182,6 +4184,7 @@ CONFIG_ROSE=m 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_RPR0521=m CONFIG_RSI_91X=m CONFIG_RSI_DEBUGFS=y @@ -5177,6 +5180,7 @@ CONFIG_STMMAC_ETH=m # CONFIG_STMMAC_PLATFORM is not set # CONFIG_STM_SOURCE_CONSOLE is not set CONFIG_STRICT_DEVMEM=y +# CONFIG_STRING_SELFTEST is not set CONFIG_STRIP_ASM_SYMS=y # CONFIG_STRIP is not set CONFIG_SUNDANCE=m |