diff options
| author | Olof Johansson <olof@lixom.net> | 2018-07-14 14:07:48 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-07-14 14:07:48 -0700 |
| commit | 11d378ce5d744be5ef74a5663fdcff5da312e9fd (patch) | |
| tree | 147e45f9cc601f9e7e46207335b2ffb17f1d4806 /arch/arm/configs/multi_v7_defconfig | |
| parent | 2d74fac5acd5b612b70216a77f248d8ab1165294 (diff) | |
| parent | b0ba9fad81e419f85829c2a6925110d9714dd708 (diff) | |
| download | linux-11d378ce5d744be5ef74a5663fdcff5da312e9fd.tar.bz2 | |
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 <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs/multi_v7_defconfig')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 8f6be1982545..5ddbe93e189d 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -447,6 +447,7 @@ CONFIG_SENSORS_LM90=y 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_IMX_THERMAL=y |