projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'arc-v3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
thermal
/
Kconfig
diff --git
a/drivers/thermal/Kconfig
b/drivers/thermal/Kconfig
index 5f88d767671e956fa400b039f2cc21de9bc58621..2d51912a6e408a338ff0e8c6727dc8a8d21c6dd1 100644
(file)
--- a/
drivers/thermal/Kconfig
+++ b/
drivers/thermal/Kconfig
@@
-143,7
+143,7
@@
config RCAR_THERMAL
config KIRKWOOD_THERMAL
tristate "Temperature sensor on Marvell Kirkwood SoCs"
config KIRKWOOD_THERMAL
tristate "Temperature sensor on Marvell Kirkwood SoCs"
- depends on ARCH_KIRKWOOD
+ depends on ARCH_KIRKWOOD
|| MACH_KIRKWOOD
depends on OF
help
Support for the Kirkwood thermal sensor driver into the Linux thermal
depends on OF
help
Support for the Kirkwood thermal sensor driver into the Linux thermal