diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-04-17 07:26:16 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-04-17 07:26:16 +0200 |
| commit | fc85d46525b4cdd92941f33d199ef5640273261b (patch) | |
| tree | ef55fdbd633239d2a3ee1036f2d94f8f36014705 /kernel-armv7hl-debug.config | |
| parent | 23a26ccc240ce16fd566a92fc4a741f859edbd65 (diff) | |
| parent | 7d9c2edc800d977525ab1f8931d44ac3c2b14b8d (diff) | |
| download | kernel-fc85d46525b4cdd92941f33d199ef5640273261b.tar.gz kernel-fc85d46525b4cdd92941f33d199ef5640273261b.tar.xz kernel-fc85d46525b4cdd92941f33d199ef5640273261b.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.17.0-0.rc1.git0.1.vanilla.knurd.1.fc29kernel-4.17.0-0.rc1.git0.1.vanilla.knurd.1.fc28kernel-4.17.0-0.rc1.git0.1.vanilla.knurd.1.fc27kernel-4.17.0-0.rc1.git0.1.vanilla.knurd.1.fc26
Diffstat (limited to 'kernel-armv7hl-debug.config')
| -rw-r--r-- | kernel-armv7hl-debug.config | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index a036d4594..d1528e656 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -965,6 +965,7 @@ CONFIG_COMMON_CLK_SCMI=m CONFIG_COMMON_CLK_SCPI=m # CONFIG_COMMON_CLK_SI514 is not set CONFIG_COMMON_CLK_SI5351=m +CONFIG_COMMON_CLK_SI544=m # CONFIG_COMMON_CLK_SI570 is not set CONFIG_COMMON_CLK_TI_ADPLL=m # CONFIG_COMMON_CLK_VC5 is not set @@ -4288,6 +4289,7 @@ CONFIG_OSF_PARTITION=y CONFIG_OVERLAY_FS=m CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set +# CONFIG_OVERLAY_FS_XINO_AUTO is not set CONFIG_P54_COMMON=m CONFIG_P54_PCI=m # CONFIG_P54_SPI_DEFAULT_EEPROM is not set @@ -6319,6 +6321,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y CONFIG_THERMAL_GOV_USER_SPACE=y CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_OF=y +CONFIG_THERMAL_STATISTICS=y # CONFIG_THERMAL_WRITABLE_TRIPS is not set CONFIG_THERMAL=y CONFIG_THRUSTMASTER_FF=y |