Merge branch 'cleanups' into next

[linux-2.6] / drivers / hwmon / Kconfig

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index e47f88170806f0cff4ec3ac56b9d63273e5cad9f..368879ff5d8c5642250c9a9db9962dcff45aa83e 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -143,6 +143,16 @@ config SENSORS_ADT7470
          This driver can also be built as a module. If so, the module
          will be called adt7470.
 
          This driver can also be built as a module. If so, the module
          will be called adt7470.
 

+config SENSORS_ADT7473
+       tristate "Analog Devices ADT7473"
+       depends on I2C && EXPERIMENTAL
+       help
+         If you say yes here you get support for the Analog Devices
+         ADT7473 temperature monitoring chips.
+
+         This driver can also be built as a module. If so, the module
+         will be called adt7473.
+

 config SENSORS_K8TEMP
        tristate "AMD Athlon64/FX or Opteron temperature sensor"
        depends on X86 && PCI && EXPERIMENTAL
 config SENSORS_K8TEMP
        tristate "AMD Athlon64/FX or Opteron temperature sensor"
        depends on X86 && PCI && EXPERIMENTAL


@@ -158,6 +168,7 @@ config SENSORS_K8TEMP
 config SENSORS_AMS
        tristate "Apple Motion Sensor driver"
        depends on PPC_PMAC && !PPC64 && INPUT && ((ADB_PMU && I2C = y) || (ADB_PMU && !I2C) || I2C) && EXPERIMENTAL
 config SENSORS_AMS
        tristate "Apple Motion Sensor driver"
        depends on PPC_PMAC && !PPC64 && INPUT && ((ADB_PMU && I2C = y) || (ADB_PMU && !I2C) || I2C) && EXPERIMENTAL

+       select INPUT_POLLDEV

        help
          Support for the motion sensor included in PowerBooks. Includes
          implementations for PMU and I2C.
        help
          Support for the motion sensor included in PowerBooks. Includes
          implementations for PMU and I2C.


@@ -215,6 +226,16 @@ config SENSORS_DS1621
          This driver can also be built as a module.  If so, the module
          will be called ds1621.
 
          This driver can also be built as a module.  If so, the module
          will be called ds1621.
 

+config SENSORS_I5K_AMB
+       tristate "FB-DIMM AMB temperature sensor on Intel 5000 series chipsets"
+       depends on PCI && EXPERIMENTAL
+       help
+         If you say yes here you get support for FB-DIMM AMB temperature
+         monitoring chips on systems with the Intel 5000 series chipset.
+
+         This driver can also be built as a module. If so, the module
+         will be called i5k_amb.
+

 config SENSORS_F71805F
        tristate "Fintek F71805F/FG, F71806F/FG and F71872F/FG"
        depends on EXPERIMENTAL
 config SENSORS_F71805F
        tristate "Fintek F71805F/FG, F71806F/FG and F71872F/FG"
        depends on EXPERIMENTAL


@@ -422,12 +443,12 @@ config SENSORS_LM85
          will be called lm85.
 
 config SENSORS_LM87
          will be called lm85.
 
 config SENSORS_LM87

-       tristate "National Semiconductor LM87"
+       tristate "National Semiconductor LM87 and compatibles"

        depends on I2C
        select HWMON_VID
        help
          If you say yes here you get support for National Semiconductor LM87
        depends on I2C
        select HWMON_VID
        help
          If you say yes here you get support for National Semiconductor LM87

-         sensor chips.
+         and Analog Devices ADM1024 sensor chips.

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


@@ -577,6 +598,16 @@ config SENSORS_SMSC47B397
          This driver can also be built as a module.  If so, the module
          will be called smsc47b397.
 
          This driver can also be built as a module.  If so, the module
          will be called smsc47b397.
 

+config SENSORS_ADS7828
+       tristate "Texas Instruments ADS7828"
+       depends on I2C
+       help
+         If you say yes here you get support for Texas Instruments ADS7828
+         12-bit 8-channel ADC device.
+
+         This driver can also be built as a module.  If so, the module
+         will be called ads7828.
+

 config SENSORS_THMC50
        tristate "Texas Instruments THMC50 / Analog Devices ADM1022"
        depends on I2C && EXPERIMENTAL
 config SENSORS_THMC50
        tristate "Texas Instruments THMC50 / Analog Devices ADM1022"
        depends on I2C && EXPERIMENTAL


@@ -620,13 +651,13 @@ config SENSORS_VT8231
          will be called vt8231.
 
 config SENSORS_W83781D
          will be called vt8231.
 
 config SENSORS_W83781D

-       tristate "Winbond W83781D, W83782D, W83783S, W83627HF, Asus AS99127F"
+       tristate "Winbond W83781D, W83782D, W83783S, Asus AS99127F"

        depends on I2C
        select HWMON_VID
        help
          If you say yes here you get support for the Winbond W8378x series
        depends on I2C
        select HWMON_VID
        help
          If you say yes here you get support for the Winbond W8378x series

-         of sensor chips: the W83781D, W83782D, W83783S and W83627HF,
-         and the similar Asus AS99127F.
+         of sensor chips: the W83781D, W83782D and W83783S, and the similar
+         Asus AS99127F.

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


@@ -672,6 +703,16 @@ config SENSORS_W83L785TS
          This driver can also be built as a module.  If so, the module
          will be called w83l785ts.
 
          This driver can also be built as a module.  If so, the module
          will be called w83l785ts.
 

+config SENSORS_W83L786NG
+       tristate "Winbond W83L786NG, W83L786NR"
+       depends on I2C && EXPERIMENTAL
+       help
+         If you say yes here you get support for the Winbond W83L786NG
+         and W83L786NR sensor chips.
+
+         This driver can also be built as a module.  If so, the module
+         will be called w83l786ng.
+

 config SENSORS_W83627HF
        tristate "Winbond W83627HF, W83627THF, W83637HF, W83687THF, W83697HF"
        select HWMON_VID
 config SENSORS_W83627HF
        tristate "Winbond W83627HF, W83627THF, W83637HF, W83687THF, W83697HF"
        select HWMON_VID


@@ -701,6 +742,7 @@ config SENSORS_W83627EHF
 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

+       select INPUT_POLLDEV

        default n
        help
          This driver provides support for the IBM Hard Drive Active Protection
        default n
        help
          This driver provides support for the IBM Hard Drive Active Protection


@@ -722,6 +764,7 @@ config SENSORS_APPLESMC
        depends on INPUT && X86
        select NEW_LEDS
        select LEDS_CLASS
        depends on INPUT && X86
        select NEW_LEDS
        select LEDS_CLASS

+       select INPUT_POLLDEV

        default n
        help
          This driver provides support for the Apple System Management
        default n
        help
          This driver provides support for the Apple System Management