diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-17 18:21:30 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-17 18:21:30 +0200 |
| commit | 9d8cc94b05933f016a226898842277611bafd566 (patch) | |
| tree | 44bd1fc40427c8d932bb2d5bcac9f86b3b1feedc /kernel-i686-fedora.config | |
| parent | 6243c80866b326be88265a9756403a577110d2d9 (diff) | |
| parent | fa13b59d638eb5dd773694de898e8f99d1d85526 (diff) | |
| download | kernel-9d8cc94b05933f016a226898842277611bafd566.tar.gz kernel-9d8cc94b05933f016a226898842277611bafd566.tar.xz kernel-9d8cc94b05933f016a226898842277611bafd566.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc1.1.vanilla.1.fc34kernel-5.9.0-0.rc1.1.vanilla.1.fc33kernel-5.9.0-0.rc1.1.vanilla.1.fc32kernel-5.9.0-0.rc1.1.vanilla.1.fc31
Diffstat (limited to 'kernel-i686-fedora.config')
| -rw-r--r-- | kernel-i686-fedora.config | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index aded0b129..389dfbc17 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -274,7 +274,6 @@ CONFIG_ARM64_ERRATUM_1542419=y CONFIG_ARM64_ERRATUM_858921=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y -CONFIG_ARM_SMCCC_SOC_ID=y # CONFIG_ARM_SMC_WATCHDOG is not set # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set CONFIG_ARM_TEGRA194_CPUFREQ=y @@ -847,6 +846,7 @@ CONFIG_CLK_BCM2711_DVP=y # CONFIG_CLK_QORIQ is not set # CONFIG_CLK_RASPBERRYPI is not set # CONFIG_CLK_SIFIVE is not set +# CONFIG_CLKSRC_STM32_LP is not set # CONFIG_CLK_SUNXI_CLOCKS is not set # CONFIG_CLK_SUNXI is not set # CONFIG_CLK_SUNXI_PRCM_SUN6I is not set @@ -1622,7 +1622,7 @@ CONFIG_ENABLE_MUST_CHECK=y CONFIG_ENA_ETHERNET=m CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=y -# CONFIG_ENERGY_MODEL is not set +CONFIG_ENERGY_MODEL=y CONFIG_ENIC=m CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m @@ -3109,7 +3109,7 @@ CONFIG_LTC1660=m # CONFIG_LTC2632 is not set CONFIG_LTC2983=m # CONFIG_LTE_GDM724X is not set -# CONFIG_LTR501 is not set +CONFIG_LTR501=m CONFIG_LV0104CS=m CONFIG_LWTUNNEL_BPF=y CONFIG_LWTUNNEL=y @@ -3307,6 +3307,7 @@ CONFIG_MFD_INTEL_PMC_BXT=m # CONFIG_MFD_IQS62X is not set # CONFIG_MFD_JANZ_CMODIO is not set # CONFIG_MFD_KEMPLD is not set +# CONFIG_MFD_KHADAS_MCU is not set # CONFIG_MFD_LM3533 is not set # CONFIG_MFD_LOCHNAGAR is not set # CONFIG_MFD_LP3943 is not set @@ -4534,7 +4535,7 @@ CONFIG_PM_DEVFREQ=y # CONFIG_PMIC_DA903X is not set CONFIG_PMIC_OPREGION=y CONFIG_PM_OPP=y -# CONFIG_PMS7003 is not set +CONFIG_PMS7003=m CONFIG_PM_STD_PARTITION="" CONFIG_PM_TEST_SUSPEND=y CONFIG_PM_TRACE_RTC=y @@ -5067,7 +5068,9 @@ CONFIG_SBP_TARGET=m # CONFIG_SC1200_WDT is not set CONFIG_SC92031=m # CONFIG_SCA3000 is not set -# CONFIG_SCD30_CORE is not set +CONFIG_SCD30_CORE=m +CONFIG_SCD30_I2C=m +CONFIG_SCD30_SERIAL=m # CONFIG_SC_DISPCC_7180 is not set # CONFIG_SC_GPUCC_7180 is not set CONFIG_SCHED_AUTOGROUP=y |