[WATCHDOG] pci: use pci_ioremap_bar() in drivers/watchdog

[linux-2.6-omap-h63xx.git] / drivers / hwmon / Kconfig

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 3309e862f31735e6e44ad61eeac1760f6e349fc0..6de1e0ffd391efe9669fcae51df41beeb9a39407 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -510,11 +510,9 @@ config SENSORS_LM90
        depends on I2C
        help
          If you say yes here you get support for National Semiconductor LM90,
        depends on I2C
        help
          If you say yes here you get support for National Semiconductor LM90,

-         LM86, LM89 and LM99, Analog Devices ADM1032 and Maxim MAX6657,
-         MAX6658, MAX6659, MAX6680 and MAX6681 sensor chips.
-
-         The Analog Devices ADT7461 sensor chip is also supported, but only
-         if found in ADM1032 compatibility mode.
+         LM86, LM89 and LM99, Analog Devices ADM1032 and ADT7461, and Maxim
+         MAX6646, MAX6647, MAX6649, MAX6657, MAX6658, MAX6659, MAX6680 and
+         MAX6681 sensor chips.

 
          This driver can also be built as a module.  If so, the module
          will be called lm90.
 
          This driver can also be built as a module.  If so, the module
          will be called lm90.


@@ -800,6 +798,13 @@ config SENSORS_W83627EHF
          This driver can also be built as a module.  If so, the module
          will be called w83627ehf.
 
          This driver can also be built as a module.  If so, the module
          will be called w83627ehf.
 

+config SENSORS_ULTRA45
+       tristate "Sun Ultra45 PIC16F747"
+       depends on SPARC64
+       help
+         This driver provides support for the Ultra45 workstation environmental
+         sensors.
+

 config SENSORS_HDAPS
        tristate "IBM Hard Drive Active Protection System (hdaps)"
        depends on INPUT && X86
 config SENSORS_HDAPS
        tristate "IBM Hard Drive Active Protection System (hdaps)"
        depends on INPUT && X86