diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2016-11-21 21:20:15 -0800 |
|---|---|---|
| committer | Florian Fainelli <f.fainelli@gmail.com> | 2016-11-21 21:20:15 -0800 |
| commit | 33c037c51be5df857ae563f7fc551dc6e746d9de (patch) | |
| tree | 302f356c8c25462cf50dacb8f77f0155993bd0e8 /arch/arm/configs | |
| parent | 8dace30404264b83990c99bf2021ed78629c683d (diff) | |
| parent | bab0cb90550467c71f4e1b73da406a2280c4f418 (diff) | |
Merge tag 'bcm2835-defconfig-next-2016-11-18' into defconfig/next
This pull request enables the BCM2835 (Raspberry Pi) thermal driver in
the Pi1 defconfig.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/bcm2835_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/bcm2835_defconfig b/arch/arm/configs/bcm2835_defconfig index 79de828e49ad..4b89f4e6e849 100644 --- a/arch/arm/configs/bcm2835_defconfig +++ b/arch/arm/configs/bcm2835_defconfig @@ -73,6 +73,8 @@ CONFIG_SPI_BCM2835=y CONFIG_SPI_BCM2835AUX=y CONFIG_GPIO_SYSFS=y # CONFIG_HWMON is not set +CONFIG_THERMAL=y +CONFIG_BCM2835_THERMAL=y CONFIG_WATCHDOG=y CONFIG_BCM2835_WDT=y CONFIG_DRM=y |