OSDN Git Service
(root)
/
android-x86
/
kernel.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
[android-x86/kernel.git]
/
drivers
/
thermal
/
Kconfig
diff --git
a/drivers/thermal/Kconfig
b/drivers/thermal/Kconfig
index
9b012ff
..
f554d25
100644
(file)
--- a/
drivers/thermal/Kconfig
+++ b/
drivers/thermal/Kconfig
@@
-153,7
+153,7
@@
config RCAR_THERMAL
config KIRKWOOD_THERMAL
tristate "Temperature sensor on Marvell Kirkwood SoCs"
- depends on
ARCH_KIRKWOOD ||
MACH_KIRKWOOD
+ depends on MACH_KIRKWOOD
depends on OF
help
Support for the Kirkwood thermal sensor driver into the Linux thermal