aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-08-18 23:59:07 +0200
committerArnd Bergmann <arnd@arndb.de>2017-08-18 23:59:07 +0200
commit32f4049a1f62abe95a3f1da83402d510a6ec5487 (patch)
tree8ab9f593ceea8f7436a675bdb9d2dd4b1bfef891
parentMerge tag 'hisi-defconfig-for-4.14' of git://github.com/hisilicon/linux-hisi into next/arm64 (diff)
parentarm64: defconfig: add CONFIG_BRCMSTB_THERMAL (diff)
downloadlinux-dev-32f4049a1f62abe95a3f1da83402d510a6ec5487.tar.xz
linux-dev-32f4049a1f62abe95a3f1da83402d510a6ec5487.zip
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
-rw-r--r--arch/arm64/configs/defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index efc7dd0001ad..21af264730f0 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -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