hwmon: (adt7475) Rework voltage inputs handling

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

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 461abb1..5b2eaff 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -191,21 +191,25 @@ config SENSORS_ADT7470
          will be called adt7470.
 
 config SENSORS_ADT7473
-       tristate "Analog Devices ADT7473"
+       tristate "Analog Devices ADT7473 (DEPRECATED)"
        depends on I2C && EXPERIMENTAL
+       select SENSORS_ADT7475
        help
          If you say yes here you get support for the Analog Devices
          ADT7473 temperature monitoring chips.
 
+         This driver is deprecated, you should use the adt7475 driver
+         instead.
+
          This driver can also be built as a module. If so, the module
          will be called adt7473.
 
 config SENSORS_ADT7475
-       tristate "Analog Devices ADT7475"
+       tristate "Analog Devices ADT7473 and ADT7475"
        depends on I2C && EXPERIMENTAL
        help
          If you say yes here you get support for the Analog Devices
-         ADT7475 hardware monitoring chips.
+         ADT7473 and ADT7475 hardware monitoring chips.
 
          This driver can also be build as a module.  If so, the module
          will be called adt7475.
@@ -305,12 +309,12 @@ config SENSORS_F71805F
          will be called f71805f.
 
 config SENSORS_F71882FG
-       tristate "Fintek F71858FG, F71862FG, F71882FG and F8000"
+       tristate "Fintek F71858FG, F71862FG, F71882FG, F71889FG and F8000"
        depends on EXPERIMENTAL
        help
          If you say yes here you get support for hardware monitoring
-         features of the Fintek F71858FG, F71862FG/71863FG, F71882FG/F71883FG
-         and F8000 Super-I/O chips.
+         features of the Fintek F71858FG, F71862FG/71863FG, F71882FG/F71883FG,
+         F71889FG and F8000 Super-I/O chips.
 
          This driver can also be built as a module.  If so, the module
          will be called f71882fg.
@@ -325,34 +329,6 @@ config SENSORS_F75375S
          This driver can also be built as a module.  If so, the module
          will be called f75375s.
 
-config SENSORS_FSCHER
-       tristate "FSC Hermes (DEPRECATED)"
-       depends on X86 && I2C
-       help
-         This driver is DEPRECATED please use the new merged fschmd
-         ("FSC Poseidon, Scylla, Hermes, Heimdall and Heracles") driver
-         instead.
-
-         If you say yes here you get support for Fujitsu Siemens
-         Computers Hermes sensor chips.
-
-         This driver can also be built as a module.  If so, the module
-         will be called fscher.
-
-config SENSORS_FSCPOS
-       tristate "FSC Poseidon (DEPRECATED)"
-       depends on X86 && I2C
-       help
-         This driver is DEPRECATED please use the new merged fschmd
-         ("FSC Poseidon, Scylla, Hermes, Heimdall and Heracles") driver
-         instead.
-
-         If you say yes here you get support for Fujitsu Siemens
-         Computers Poseidon sensor chips.
-
-         This driver can also be built as a module.  If so, the module
-         will be called fscpos.
-
 config SENSORS_FSCHMD
        tristate "Fujitsu Siemens Computers sensor chips"
        depends on X86 && I2C
@@ -401,12 +377,12 @@ config SENSORS_GL520SM
          will be called gl520sm.
 
 config SENSORS_CORETEMP
-       tristate "Intel Core (2) Duo/Solo temperature sensor"
+       tristate "Intel Core/Core2/Atom temperature sensor"
        depends on X86 && EXPERIMENTAL
        help
          If you say yes here you get support for the temperature
-         sensor inside your CPU. Supported all are all known variants
-         of Intel Core family.
+         sensor inside your CPU. Most of the family 6 CPUs
+         are supported. Check documentation/driver for details.
 
 config SENSORS_IBMAEM
        tristate "IBM Active Energy Manager temperature/power sensors and control"
@@ -470,6 +446,15 @@ config SENSORS_LM70
          This driver can also be built as a module.  If so, the module
          will be called lm70.
 
+config SENSORS_LM73
+       tristate "National Semiconductor LM73"
+       depends on I2C
+       help
+         If you say yes here you get support for National Semiconductor LM73
+         sensor chips.
+         This driver can also be built as a module.  If so, the module
+         will be called lm73.
+
 config SENSORS_LM75
        tristate "National Semiconductor LM75 and compatibles"
        depends on I2C
@@ -703,7 +688,7 @@ config SENSORS_SHT15
 
 config SENSORS_S3C
        tristate "S3C24XX/S3C64XX Inbuilt ADC"
-       depends on ARCH_S3C2410 || ARCH_S3C64XX
+       depends on ARCH_S3C2410
        help
          If you say yes here you get support for the on-board ADCs of
          the Samsung S3C24XX or S3C64XX series of SoC
@@ -869,7 +854,7 @@ config SENSORS_W83781D
 
 config SENSORS_W83791D
        tristate "Winbond W83791D"
-       depends on I2C && EXPERIMENTAL
+       depends on I2C
        select HWMON_VID
        help
          If you say yes here you get support for the Winbond W83791D chip.
@@ -946,6 +931,27 @@ config SENSORS_W83627EHF
          This driver can also be built as a module.  If so, the module
          will be called w83627ehf.
 
+config SENSORS_WM831X
+       tristate "WM831x PMICs"
+       depends on MFD_WM831X
+       help
+         If you say yes here you get support for the hardware
+         monitoring functionality of the Wolfson Microelectronics
+         WM831x series of PMICs.
+
+         This driver can also be built as a module.  If so, the module
+         will be called wm831x-hwmon.
+
+config SENSORS_WM8350
+       tristate "Wolfson Microelectronics WM835x"
+       depends on MFD_WM8350
+       help
+         If you say yes here you get support for the hardware
+         monitoring features of the WM835x series of PMICs.
+
+         This driver can also be built as a module.  If so, the module
+         will be called wm8350-hwmon.
+
 config SENSORS_ULTRA45
        tristate "Sun Ultra45 PIC16F747"
        depends on SPARC64
@@ -1015,6 +1021,12 @@ config SENSORS_APPLESMC
          Say Y here if you have an applicable laptop and want to experience
          the awesome power of applesmc.
 
+config SENSORS_MC13783_ADC
+        tristate "Freescale MC13783 ADC"
+        depends on MFD_MC13783
+        help
+          Support for the A/D converter on MC13783 PMIC.
+
 if ACPI
 
 comment "ACPI drivers"