diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-19 13:56:01 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-19 13:56:01 -0500 |
| commit | a767835f6dc85277e40fbfe69a29c18817d6c00b (patch) | |
| tree | aa22dc73ec92aaf34c9b0fb2c5dbeedad40d6312 | |
| parent | d633180c20271d3b7c1fabbccbc7c5b30ad12be4 (diff) | |
| parent | 3627902377c4fbdeef4c689fb43b47a86a3ec859 (diff) | |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (exynos4_tmu) Fix Kconfig dependency
[ Merging code in-flight, just because I can. What timezone should I
use? - Linus ]
| -rw-r--r-- | drivers/hwmon/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index 9ec854ae118b..91be41f60809 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig | |||
| @@ -315,7 +315,7 @@ config SENSORS_DS1621 | |||
| 315 | 315 | ||
| 316 | config SENSORS_EXYNOS4_TMU | 316 | config SENSORS_EXYNOS4_TMU |
| 317 | tristate "Temperature sensor on Samsung EXYNOS4" | 317 | tristate "Temperature sensor on Samsung EXYNOS4" |
| 318 | depends on EXYNOS4_DEV_TMU | 318 | depends on ARCH_EXYNOS4 |
| 319 | help | 319 | help |
| 320 | If you say yes here you get support for TMU (Thermal Managment | 320 | If you say yes here you get support for TMU (Thermal Managment |
| 321 | Unit) on SAMSUNG EXYNOS4 series of SoC. | 321 | Unit) on SAMSUNG EXYNOS4 series of SoC. |