diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-02-07 17:12:27 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-02-07 17:12:27 +0100 |
| commit | 4f3a468666f78625142529434a51edf13c3acfed (patch) | |
| tree | bccae46064e2455b0c7f2abb623522c0c41aae8e /arch/arm/configs | |
| parent | fa11b3dd54ec26ad1daf442e78063eb21f4d93d4 (diff) | |
| parent | 11937f69b65b08d3184b1ebc864668be4b6c5427 (diff) | |
Merge tag 'sunxi-defconfig-for-4.11' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/defconfig
Pull "Allwinner defconfig changes for 4.11" from Maxime Ripard:
A single patch to enable the thermal DT support in sunxi_defconfig
* tag 'sunxi-defconfig-for-4.11' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
ARM: sunxi: Add CONFIG_THERMAL_OF
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/sunxi_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig index dfeee5c51b40..da92c25eb7cc 100644 --- a/arch/arm/configs/sunxi_defconfig +++ b/arch/arm/configs/sunxi_defconfig @@ -83,6 +83,7 @@ CONFIG_GPIO_SYSFS=y CONFIG_POWER_SUPPLY=y CONFIG_AXP20X_POWER=y CONFIG_THERMAL=y +CONFIG_THERMAL_OF=y CONFIG_CPU_THERMAL=y CONFIG_WATCHDOG=y CONFIG_SUNXI_WATCHDOG=y |