Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32f4049a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'arm-soc/for-4.14/defconfig-arm64' of http://github.com/Broadcom/stblinux into next/arm64 

Pull "Broadcom defconfig-arm64 changes for 4.14" from Florian Fainelli:

This pull request contains ARM64 defconfig changes for Broadcom ARM64-based
SoCs for 4.14, please pull the following:

- Markus enables the Broadcom STB AVS thermal monitoring driver as a module
  which is currently queued in Rui Zhang's tree

* tag 'arm-soc/for-4.14/defconfig-arm64' of http://github.com/Broadcom/stblinux:
  arm64: defconfig: add CONFIG_BRCMSTB_THERMAL
parents 4d3ae0d1 d5512507

arch/arm64/configs/defconfig

+1 −0
Original line number Diff line number Diff line
@@ -311,6 +311,7 @@ CONFIG_SENSORS_INA2XX=m 
CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y

CONFIG_CPU_THERMAL=y

CONFIG_THERMAL_EMULATION=y

CONFIG_BRCMSTB_THERMAL=m

CONFIG_EXYNOS_THERMAL=y

CONFIG_ROCKCHIP_THERMAL=m

CONFIG_WATCHDOG=y