Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux...

[~andy/linux] / drivers / hwmon / Kconfig

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index c74e73b2069ad230cd1be4ae4d7510252d44f52b..c4633de64465a2eccc5d0305238feee8a8c28375 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -334,16 +334,6 @@ config SENSORS_DA9052_ADC
          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