From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 28 Sep 2012 01:16:01 +0000 (+1000)
Subject: Merge remote-tracking branch 'thermal/next'
X-Git-Tag: next-20120928~76
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=54c22cd9710513dd57cde2582d1684388a828493;p=karo-tx-linux.git

Merge remote-tracking branch 'thermal/next'
---

54c22cd9710513dd57cde2582d1684388a828493
diff --cc drivers/hwmon/Kconfig
index c74e73b2069a,84e02b416a4a..c4633de64465
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@@ -334,19 -324,9 +334,9 @@@ config SENSORS_DA9052_AD
  	  This driver can also be built as module. If so, the module
  	  will be called da9052-hwmon.
  
- config SENSORS_EXYNOS4_TMU
- 	tristate "Temperature sensor on Samsung EXYNOS4"
- 	depends on ARCH_EXYNOS4
- 	help
- 	  If you say yes here you get support for TMU (Thermal Management
- 	  Unit) on SAMSUNG EXYNOS4 series of SoC.
- 
- 	  This driver can also be built as a module. If so, the module
- 	  will be called exynos4-tmu.
- 
  config SENSORS_I5K_AMB
  	tristate "FB-DIMM AMB temperature sensor on Intel 5000 series chipsets"
 -	depends on PCI && EXPERIMENTAL
 +	depends on PCI
  	help
  	  If you say yes here you get support for FB-DIMM AMB temperature
  	  monitoring chips on systems with the Intel 5000 series chipset.