diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2016-11-21 21:22:55 -0800 |
|---|---|---|
| committer | Florian Fainelli <f.fainelli@gmail.com> | 2016-11-21 21:22:55 -0800 |
| commit | 9efacfc80902c6ddf538a2f396e0112c1f6d1e23 (patch) | |
| tree | 2e1d7903199b97a96068df9de93683606ae5a1e9 /arch/arm64/configs | |
| parent | 4f43c501db32138ca50d3bcef9d5f509db050059 (diff) | |
| parent | ac178e4280e65f4d0d14b13a7bfec3a43ff90e66 (diff) | |
Merge tag 'bcm2835-defconfig-64-next-2016-11-18' into defconfig-arm64/next
This pull enables the BCM2837 (Pi 3) thermal driver in the defconfig.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Diffstat (limited to 'arch/arm64/configs')
| -rw-r--r-- | arch/arm64/configs/defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index c3fde6f16974..ed43f7198d1b 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -280,6 +280,7 @@ CONFIG_THERMAL=y CONFIG_THERMAL_EMULATION=y CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y CONFIG_CPU_THERMAL=y +CONFIG_BCM2835_THERMAL=y CONFIG_EXYNOS_THERMAL=y CONFIG_WATCHDOG=y CONFIG_BCM2835_WDT=y |