From: Olof Johansson Date: Sat, 14 Jul 2018 21:07:48 +0000 (-0700) Subject: Merge tag 'arm-soc/for-4.19/defconfig' of https://github.com/Broadcom/stblinux into... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=11d378ce5d744be5ef74a5663fdcff5da312e9fd;p=linux.git Merge tag 'arm-soc/for-4.19/defconfig' of https://github.com/Broadcom/stblinux into next/defconfig This pull request contains Broadcom ARM-based SoCs defconfig updates for 4.19, please pull the following: - Stefan enables the Raspberry Pi voltage sensor driver (HWMON) in both multi_v7_defconfig and bcm2835_defconfig * tag 'arm-soc/for-4.19/defconfig' of https://github.com/Broadcom/stblinux: ARM: multi_v7_defconfig: Enable RPi voltage sensor ARM: bcm2835_defconfig: Enable RPi voltage sensor Signed-off-by: Olof Johansson --- 11d378ce5d744be5ef74a5663fdcff5da312e9fd diff --cc arch/arm/configs/multi_v7_defconfig index 8f6be19825456,b1ce941378fe2..5ddbe93e189de --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@@ -447,8 -478,11 +447,9 @@@ CONFIG_SENSORS_LM90= CONFIG_SENSORS_LM95245=y CONFIG_SENSORS_NTC_THERMISTOR=m CONFIG_SENSORS_PWM_FAN=m + CONFIG_SENSORS_RASPBERRYPI_HWMON=m CONFIG_SENSORS_INA2XX=m CONFIG_CPU_THERMAL=y -CONFIG_BCM2835_THERMAL=m -CONFIG_BRCMSTB_THERMAL=m CONFIG_IMX_THERMAL=y CONFIG_ROCKCHIP_THERMAL=y CONFIG_RCAR_THERMAL=y