diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2012-11-21 05:38:13 -0500 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2012-11-21 05:38:13 -0500 |
| commit | 851462444d421c223965b12b836bef63da61b57f (patch) | |
| tree | 495baa14e638817941496c36e1443aed7dae0ea0 /drivers/hwmon/Kconfig | |
| parent | 5a6ea4af0907f995dc06df21a9c9ef764c7cd3bc (diff) | |
| parent | 6924d99fcdf1a688538a3cdebd1f135c22eec191 (diff) | |
Merge branch 'for-3.7' of git://git.infradead.org/users/dedekind/l2-mtd
Conflicts:
drivers/mtd/nand/nand_base.c
Diffstat (limited to 'drivers/hwmon/Kconfig')
| -rw-r--r-- | drivers/hwmon/Kconfig | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index c74e73b2069a..c4633de64465 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig | |||
| @@ -334,16 +334,6 @@ config SENSORS_DA9052_ADC | |||
| 334 | This driver can also be built as module. If so, the module | 334 | This driver can also be built as module. If so, the module |
| 335 | will be called da9052-hwmon. | 335 | will be called da9052-hwmon. |
| 336 | 336 | ||
| 337 | config SENSORS_EXYNOS4_TMU | ||
| 338 | tristate "Temperature sensor on Samsung EXYNOS4" | ||
| 339 | depends on ARCH_EXYNOS4 | ||
| 340 | help | ||
| 341 | If you say yes here you get support for TMU (Thermal Management | ||
| 342 | Unit) on SAMSUNG EXYNOS4 series of SoC. | ||
| 343 | |||
| 344 | This driver can also be built as a module. If so, the module | ||
| 345 | will be called exynos4-tmu. | ||
| 346 | |||
| 347 | config SENSORS_I5K_AMB | 337 | config SENSORS_I5K_AMB |
| 348 | tristate "FB-DIMM AMB temperature sensor on Intel 5000 series chipsets" | 338 | tristate "FB-DIMM AMB temperature sensor on Intel 5000 series chipsets" |
| 349 | depends on PCI | 339 | depends on PCI |