Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a767835f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'hwmon-for-linus' of...

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 ]
parents d633180c 36279023
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -315,7 +315,7 @@ config SENSORS_DS1621


config SENSORS_EXYNOS4_TMU
config SENSORS_EXYNOS4_TMU
	tristate "Temperature sensor on Samsung EXYNOS4"
	tristate "Temperature sensor on Samsung EXYNOS4"
	depends on EXYNOS4_DEV_TMU
	depends on ARCH_EXYNOS4
	help
	help
	  If you say yes here you get support for TMU (Thermal Managment
	  If you say yes here you get support for TMU (Thermal Managment
	  Unit) on SAMSUNG EXYNOS4 series of SoC.
	  Unit) on SAMSUNG EXYNOS4 series of SoC.