diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-05-20 11:15:46 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-05-20 11:15:46 +0200 |
| commit | bdfa0d1e140ae90ee7b58fdbceb991c4a816d1dd (patch) | |
| tree | 1e638c7477604dd01ecd63600b4329be86f6d49d /kernel-x86_64.config | |
| parent | ac887bf88479e5dfc3e82c18e50eccf702cc2bd1 (diff) | |
| parent | 37f7d8a33541864e227af73e90db75a3ddb2c628 (diff) | |
| download | kernel-bdfa0d1e140ae90ee7b58fdbceb991c4a816d1dd.tar.gz kernel-bdfa0d1e140ae90ee7b58fdbceb991c4a816d1dd.tar.xz kernel-bdfa0d1e140ae90ee7b58fdbceb991c4a816d1dd.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to 'kernel-x86_64.config')
| -rw-r--r-- | kernel-x86_64.config | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 21c43fd83..4e4a04070 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -3159,7 +3159,7 @@ CONFIG_MFD_MAX77650=m CONFIG_MFD_SM501_GPIO=y CONFIG_MFD_SM501=m # CONFIG_MFD_SMSC is not set -CONFIG_MFD_STMFX=m +# CONFIG_MFD_STMFX is not set # CONFIG_MFD_STMPE is not set # CONFIG_MFD_STPMIC1 is not set # CONFIG_MFD_SYSCON is not set @@ -5018,6 +5018,7 @@ CONFIG_SENSORS_NCT7904=m CONFIG_SENSORS_NPCM7XX=m CONFIG_SENSORS_NTC_THERMISTOR=m # CONFIG_SENSORS_OCC_P8_I2C is not set +# CONFIG_SENSORS_OCC_P9_SBE is not set CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_PCF8591=m @@ -5383,7 +5384,7 @@ CONFIG_SND_SOC_HDAC_HDA=m CONFIG_SND_SOC_HDAC_HDMI=m CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_IMG is not set -CONFIG_SND_SOC_IMX_AUDMIX=m +# CONFIG_SND_SOC_IMX_AUDMIX is not set # CONFIG_SND_SOC_IMX_AUDMUX is not set # CONFIG_SND_SOC_IMX_ES8328 is not set # CONFIG_SND_SOC_INNO_RK3036 is not set @@ -5798,7 +5799,7 @@ CONFIG_THERMAL_GOV_FAIR_SHARE=y CONFIG_THERMAL_GOV_STEP_WISE=y CONFIG_THERMAL_GOV_USER_SPACE=y CONFIG_THERMAL_HWMON=y -CONFIG_THERMAL_MMIO=m +# CONFIG_THERMAL_MMIO is not set # CONFIG_THERMAL_OF is not set CONFIG_THERMAL_STATISTICS=y CONFIG_THERMAL_WRITABLE_TRIPS=y |