diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-04-27 15:43:10 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-27 15:43:10 -0400 |
| commit | c0cc53162a0644dd57dce5e2fbb9bbafdc57d183 (patch) | |
| tree | 02393c85628c6ec7d0d942e880623b7f37cf3460 /drivers/thermal/Kconfig | |
| parent | net: ipv6: Use passed in table for nexthop lookups (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-dev-c0cc53162a0644dd57dce5e2fbb9bbafdc57d183.tar.xz linux-dev-c0cc53162a0644dd57dce5e2fbb9bbafdc57d183.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor overlapping changes in the conflicts.
In the macsec case, the change of the default ID macro
name overlapped with the 64-bit netlink attribute alignment
fixes in net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/thermal/Kconfig')
| -rw-r--r-- | drivers/thermal/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index c37eedc35a24..3c3dc4a3d52c 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -376,6 +376,8 @@ config MTK_THERMAL tristate "Temperature sensor driver for mediatek SoCs" depends on ARCH_MEDIATEK || COMPILE_TEST depends on HAS_IOMEM + depends on NVMEM || NVMEM=n + depends on RESET_CONTROLLER default y help Enable this option if you want to have support for thermal management |