projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
[linux-2.6-block.git]
/
drivers
/
thermal
/
Kconfig
diff --git
a/drivers/thermal/Kconfig
b/drivers/thermal/Kconfig
index 344f6459862be687e32e8c5f254fd6b78fc32968..30323426902e41bbf81a60e7558c8fe391d0729e 100644
(file)
--- a/
drivers/thermal/Kconfig
+++ b/
drivers/thermal/Kconfig
@@
-212,7
+212,7
@@
config HISI_THERMAL
config IMX_THERMAL
tristate "Temperature sensor driver for Freescale i.MX SoCs"
- depends on
(ARCH_MXC && CPU_THERMAL)
|| COMPILE_TEST
+ depends on
ARCH_MXC
|| COMPILE_TEST
depends on NVMEM || !NVMEM
depends on MFD_SYSCON
depends on OF