git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...
[sfrench/cifs-2.6.git]
/
drivers
/
thermal
/
Kconfig
diff --git
a/drivers/thermal/Kconfig
b/drivers/thermal/Kconfig
index 5fbfabbf627b8f94344b7804abd805b1cb5227e4..fdc48a1655e744f4c537334498556e2327136868 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