drm/i915: Remove a bad BUG_ON in the fence management code.

[safe/jmp/linux-2.6] / drivers / hwmon / Kconfig

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 0e8a918..d73f5f4 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -692,6 +692,16 @@ config SENSORS_PCF8591
          These devices are hard to detect and rarely found on mainstream
          hardware.  If unsure, say N.
 
+config SENSORS_SHT15
+       tristate "Sensiron humidity and temperature sensors. SHT15 and compat."
+       depends on GENERIC_GPIO
+       help
+         If you say yes here you get support for the Sensiron SHT10, SHT11,
+         SHT15, SHT71, SHT75 humidity and temperature sensors.
+
+         This driver can also be built as a module.  If so, the module
+         will be called sht15.
+
 config SENSORS_SIS5595
        tristate "Silicon Integrated Systems Corp. SiS5595"
        depends on PCI