Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux...

[~andy/linux] / drivers / hwmon / Kconfig

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 84e02b416a4ae11cd4a6745de431a0bc61b02583..c4633de64465a2eccc5d0305238feee8a8c28375 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -41,7 +41,7 @@ comment "Native drivers"
 
 config SENSORS_ABITUGURU
        tristate "Abit uGuru (rev 1 & 2)"
-       depends on X86 && DMI && EXPERIMENTAL
+       depends on X86 && DMI
        help
          If you say yes here you get support for the sensor part of the first
          and second revision of the Abit uGuru chip. The voltage and frequency
@@ -56,7 +56,7 @@ config SENSORS_ABITUGURU
 
 config SENSORS_ABITUGURU3
        tristate "Abit uGuru (rev 3)"
-       depends on X86 && DMI && EXPERIMENTAL
+       depends on X86 && DMI
        help
          If you say yes here you get support for the sensor part of the
          third revision of the Abit uGuru chip. Only reading the sensors
@@ -70,7 +70,7 @@ config SENSORS_ABITUGURU3
 
 config SENSORS_AD7314
        tristate "Analog Devices AD7314 and compatibles"
-       depends on SPI && EXPERIMENTAL
+       depends on SPI
        help
          If you say yes here you get support for the Analog Devices
          AD7314, ADT7301 and ADT7302 temperature sensors.
@@ -80,7 +80,7 @@ config SENSORS_AD7314
 
 config SENSORS_AD7414
        tristate "Analog Devices AD7414"
-       depends on I2C && EXPERIMENTAL
+       depends on I2C
        help
          If you say yes here you get support for the Analog Devices
          AD7414 temperature monitoring chip.
@@ -90,7 +90,7 @@ config SENSORS_AD7414
 
 config SENSORS_AD7418
        tristate "Analog Devices AD7416, AD7417 and AD7418"
-       depends on I2C && EXPERIMENTAL
+       depends on I2C
        help
          If you say yes here you get support for the Analog Devices
          AD7416, AD7417 and AD7418 temperature monitoring chips.
@@ -100,7 +100,7 @@ config SENSORS_AD7418
 
 config SENSORS_ADCXX
        tristate "National Semiconductor ADCxxxSxxx"
-       depends on SPI_MASTER && EXPERIMENTAL
+       depends on SPI_MASTER
        help
          If you say yes here you get support for the National Semiconductor
          ADC<bb><c>S<sss> chip family, where
@@ -179,9 +179,19 @@ config SENSORS_ADM9240
          This driver can also be built as a module.  If so, the module
          will be called adm9240.
 
+config SENSORS_ADT7410
+       tristate "Analog Devices ADT7410"
+       depends on I2C
+       help
+         If you say yes here you get support for the Analog Devices
+         ADT7410 temperature monitoring chip.
+
+         This driver can also be built as a module. If so, the module
+         will be called adt7410.
+
 config SENSORS_ADT7411
        tristate "Analog Devices ADT7411"
-       depends on I2C && EXPERIMENTAL
+       depends on I2C
        help
          If you say yes here you get support for the Analog Devices
          ADT7411 voltage and temperature monitoring chip.
@@ -191,7 +201,7 @@ config SENSORS_ADT7411
 
 config SENSORS_ADT7462
        tristate "Analog Devices ADT7462"
-       depends on I2C && EXPERIMENTAL
+       depends on I2C
        help
          If you say yes here you get support for the Analog Devices
          ADT7462 temperature monitoring chips.
@@ -201,7 +211,7 @@ config SENSORS_ADT7462
 
 config SENSORS_ADT7470
        tristate "Analog Devices ADT7470"
-       depends on I2C && EXPERIMENTAL
+       depends on I2C
        help
          If you say yes here you get support for the Analog Devices
          ADT7470 temperature monitoring chips.
@@ -236,7 +246,7 @@ config SENSORS_ASC7621
 
 config SENSORS_K8TEMP
        tristate "AMD Athlon64/FX or Opteron temperature sensor"
-       depends on X86 && PCI && EXPERIMENTAL
+       depends on X86 && PCI
        help
          If you say yes here you get support for the temperature
          sensor(s) inside your CPU. Supported is whole AMD K8
@@ -271,7 +281,7 @@ config SENSORS_FAM15H_POWER
 
 config SENSORS_ASB100
        tristate "Asus ASB100 Bach"
-       depends on X86 && I2C && EXPERIMENTAL
+       depends on X86 && I2C
        select HWMON_VID
        help
          If you say yes here you get support for the ASB100 Bach sensor
@@ -282,7 +292,7 @@ config SENSORS_ASB100
 
 config SENSORS_ATXP1
        tristate "Attansic ATXP1 VID controller"
-       depends on I2C && EXPERIMENTAL
+       depends on I2C
        select HWMON_VID
        help
          If you say yes here you get support for the Attansic ATXP1 VID
@@ -326,7 +336,7 @@ config SENSORS_DA9052_ADC
 
 config SENSORS_I5K_AMB
        tristate "FB-DIMM AMB temperature sensor on Intel 5000 series chipsets"
-       depends on PCI && EXPERIMENTAL
+       depends on PCI
        help
          If you say yes here you get support for FB-DIMM AMB temperature
          monitoring chips on systems with the Intel 5000 series chipset.
@@ -435,7 +445,7 @@ config SENSORS_GPIO_FAN
 
 config SENSORS_HIH6130
        tristate "Honeywell Humidicon HIH-6130 humidity/temperature sensor"
-       depends on I2C && EXPERIMENTAL
+       depends on I2C
        help
          If you say yes here you get support for Honeywell Humidicon
          HIH-6130 and HIH-6131 Humidicon humidity sensors.
@@ -445,7 +455,7 @@ config SENSORS_HIH6130
 
 config SENSORS_CORETEMP
        tristate "Intel Core/Core2/Atom temperature sensor"
-       depends on X86 && PCI && EXPERIMENTAL
+       depends on X86 && PCI
        help
          If you say yes here you get support for the temperature
          sensor inside your CPU. Most of the family 6 CPUs
@@ -485,8 +495,8 @@ config SENSORS_IT87
        select HWMON_VID
        help
          If you say yes here you get support for ITE IT8705F, IT8712F,
-         IT8716F, IT8718F, IT8720F, IT8721F, IT8726F, IT8728F and IT8758E
-         sensor chips, and the SiS960 clone.
+         IT8716F, IT8718F, IT8720F, IT8721F, IT8726F, IT8728F, IT8758E,
+         IT8782F, and IT8783E/F sensor chips, and the SiS950 clone.
 
          This driver can also be built as a module.  If so, the module
          will be called it87.
@@ -517,7 +527,7 @@ config SENSORS_JC42
 
 config SENSORS_LINEAGE
        tristate "Lineage Compact Power Line Power Entry Module"
-       depends on I2C && EXPERIMENTAL
+       depends on I2C
        help
          If you say yes here you get support for the Lineage Compact Power Line
          series of DC/DC and AC/DC converters such as CP1800, CP2000AC,
@@ -540,12 +550,12 @@ config SENSORS_LM63
          will be called lm63.
 
 config SENSORS_LM70
-       tristate "National Semiconductor LM70 / Texas Instruments TMP121"
+       tristate "National Semiconductor LM70 and compatibles"
        depends on SPI_MASTER
        help
          If you say yes here you get support for the National Semiconductor
-         LM70 and Texas Instruments TMP121/TMP123 digital temperature
-         sensor chips.
+         LM70, LM71, LM74 and Texas Instruments TMP121/TMP123 digital tempera-
+         ture sensor chips.
 
          This driver can also be built as a module.  If so, the module
          will be called lm70.
@@ -699,7 +709,7 @@ config SENSORS_LTC4151
 
 config SENSORS_LTC4215
        tristate "Linear Technology LTC4215"
-       depends on I2C && EXPERIMENTAL
+       depends on I2C
        default n
        help
          If you say yes here you get support for Linear Technology LTC4215
@@ -710,7 +720,7 @@ config SENSORS_LTC4215
 
 config SENSORS_LTC4245
        tristate "Linear Technology LTC4245"
-       depends on I2C && EXPERIMENTAL
+       depends on I2C
        default n
        help
          If you say yes here you get support for Linear Technology LTC4245
@@ -721,7 +731,7 @@ config SENSORS_LTC4245
 
 config SENSORS_LTC4261
        tristate "Linear Technology LTC4261"
-       depends on I2C && EXPERIMENTAL
+       depends on I2C
        default n
        help
          If you say yes here you get support for Linear Technology LTC4261
@@ -742,7 +752,7 @@ config SENSORS_LM95241
 
 config SENSORS_LM95245
        tristate "National Semiconductor LM95245 sensor chip"
-       depends on I2C && EXPERIMENTAL
+       depends on I2C
        help
          If you say yes here you get support for LM95245 sensor chip.
 
@@ -750,10 +760,11 @@ config SENSORS_LM95245
          will be called lm95245.
 
 config SENSORS_MAX1111
-       tristate "Maxim MAX1111 Multichannel, Serial 8-bit ADC chip"
+       tristate "Maxim MAX1111 Serial 8-bit ADC chip and compatibles"
        depends on SPI_MASTER
        help
-         Say y here to support Maxim's MAX1111 ADC chips.
+         Say y here to support Maxim's MAX1110, MAX1111, MAX1112, and MAX1113
+         ADC chips.
 
          This driver can also be built as a module.  If so, the module
          will be called max1111.
@@ -785,7 +796,7 @@ config SENSORS_MAX1619
 
 config SENSORS_MAX1668
        tristate "Maxim MAX1668 and compatibles"
-       depends on I2C && EXPERIMENTAL
+       depends on I2C
        help
          If you say yes here you get support for MAX1668, MAX1989 and
          MAX1805 chips.
@@ -793,9 +804,18 @@ config SENSORS_MAX1668
          This driver can also be built as a module.  If so, the module
          will be called max1668.
 
+config SENSORS_MAX197
+       tristate "Maxim MAX197 and compatibles"
+       help
+         Support for the Maxim MAX197 A/D converter.
+         Support will include, but not be limited to, MAX197, and MAX199.
+
+         This driver can also be built as a module. If so, the module
+         will be called max197.
+
 config SENSORS_MAX6639
        tristate "Maxim MAX6639 sensor chip"
-       depends on I2C && EXPERIMENTAL
+       depends on I2C
        help
          If you say yes here you get support for the MAX6639
          sensor chips.
@@ -805,7 +825,7 @@ config SENSORS_MAX6639
 
 config SENSORS_MAX6642
        tristate "Maxim MAX6642 sensor chip"
-       depends on I2C && EXPERIMENTAL
+       depends on I2C
        help
          If you say yes here you get support for MAX6642 sensor chip.
          MAX6642 is a SMBus-Compatible Remote/Local Temperature Sensor
@@ -816,7 +836,7 @@ config SENSORS_MAX6642
 
 config SENSORS_MAX6650
        tristate "Maxim MAX6650 sensor chip"
-       depends on I2C && EXPERIMENTAL
+       depends on I2C
        help
          If you say yes here you get support for the MAX6650 / MAX6651
          sensor chips.
@@ -825,18 +845,18 @@ config SENSORS_MAX6650
          will be called max6650.
 
 config SENSORS_MCP3021
-       tristate "Microchip MCP3021"
-       depends on I2C && EXPERIMENTAL
+       tristate "Microchip MCP3021 and compatibles"
+       depends on I2C
        help
-         If you say yes here you get support for the MCP3021 chip
-         that is a A/D converter (ADC) with 10-bit resolution.
+         If you say yes here you get support for MCP3021 and MCP3221.
+         The MCP3021 is a A/D converter (ADC) with 10-bit and the MCP3221
+         with 12-bit resolution.
 
          This driver can also be built as a module.  If so, the module
          will be called mcp3021.
 
 config SENSORS_NTC_THERMISTOR
        tristate "NTC thermistor support"
-       depends on EXPERIMENTAL
        help
          This driver supports NTC thermistors sensor reading and its
          interpretation. The driver can also monitor the temperature and
@@ -941,7 +961,7 @@ config SENSORS_SIS5595
 
 config SENSORS_SMM665
        tristate "Summit Microelectronics SMM665"
-       depends on I2C && EXPERIMENTAL
+       depends on I2C
        default n
        help
          If you say yes here you get support for the hardware monitoring
@@ -956,7 +976,7 @@ config SENSORS_SMM665
 
 config SENSORS_DME1737
        tristate "SMSC DME1737, SCH311x and compatibles"
-       depends on I2C && EXPERIMENTAL && !PPC
+       depends on I2C && !PPC
        select HWMON_VID
        help
          If you say yes here you get support for the hardware monitoring
@@ -1032,7 +1052,7 @@ config SENSORS_SMSC47M192
 
 config SENSORS_SMSC47B397
        tristate "SMSC LPC47B397-NC"
-       depends on EXPERIMENTAL && !PPC
+       depends on !PPC
        help
          If you say yes here you get support for the SMSC LPC47B397-NC
          sensor chip.
@@ -1106,7 +1126,7 @@ config SENSORS_ADS7871
 
 config SENSORS_AMC6821
        tristate "Texas Instruments AMC6821"
-       depends on I2C  && EXPERIMENTAL
+       depends on I2C 
        help
          If you say yes here you get support for the Texas Instruments
          AMC6821 hardware monitoring chips.
@@ -1115,11 +1135,11 @@ config SENSORS_AMC6821
          will be called amc6821.
 
 config SENSORS_INA2XX
-       tristate "Texas Instruments INA219, INA226"
-       depends on I2C && EXPERIMENTAL
+       tristate "Texas Instruments INA219 and compatibles"
+       depends on I2C
        help
-         If you say yes here you get support for INA219 and INA226 power
-         monitor chips.
+         If you say yes here you get support for INA219, INA220, INA226, and
+         INA230 power monitor chips.
 
          The INA2xx driver is configured for the default configuration of
          the part as described in the datasheet.
@@ -1139,7 +1159,7 @@ config SENSORS_THMC50
 
 config SENSORS_TMP102
        tristate "Texas Instruments TMP102"
-       depends on I2C && EXPERIMENTAL
+       depends on I2C
        help
          If you say yes here you get support for Texas Instruments TMP102
          sensor chips.
@@ -1149,7 +1169,7 @@ config SENSORS_TMP102
 
 config SENSORS_TMP401
        tristate "Texas Instruments TMP401 and compatibles"
-       depends on I2C && EXPERIMENTAL
+       depends on I2C
        help
          If you say yes here you get support for Texas Instruments TMP401 and
          TMP411 temperature sensor chips.
@@ -1159,7 +1179,7 @@ config SENSORS_TMP401
 
 config SENSORS_TMP421
        tristate "Texas Instruments TMP421 and compatible"
-       depends on I2C && EXPERIMENTAL
+       depends on I2C
        help
          If you say yes here you get support for Texas Instruments TMP421,
          TMP422 and TMP423 temperature sensor chips.
@@ -1251,7 +1271,7 @@ config SENSORS_W83792D
 
 config SENSORS_W83793
        tristate "Winbond W83793"
-       depends on I2C && EXPERIMENTAL
+       depends on I2C
        select HWMON_VID
        help
          If you say yes here you get support for the Winbond W83793
@@ -1263,7 +1283,7 @@ config SENSORS_W83793
 
 config SENSORS_W83795
        tristate "Winbond/Nuvoton W83795G/ADG"
-       depends on I2C && EXPERIMENTAL
+       depends on I2C
        help
          If you say yes here you get support for the Winbond W83795G and
          W83795ADG hardware monitoring chip, including manual fan speed
@@ -1274,7 +1294,7 @@ config SENSORS_W83795
 
 config SENSORS_W83795_FANCTRL
        boolean "Include automatic fan control support (DANGEROUS)"
-       depends on SENSORS_W83795 && EXPERIMENTAL
+       depends on SENSORS_W83795
        default n
        help
          If you say yes here, support for automatic fan speed control
@@ -1291,7 +1311,7 @@ config SENSORS_W83795_FANCTRL
 
 config SENSORS_W83L785TS
        tristate "Winbond W83L785TS-S"
-       depends on I2C && EXPERIMENTAL
+       depends on I2C
        help
          If you say yes here you get support for the Winbond W83L785TS-S
          sensor chip, which is used on the Asus A7N8X, among other
@@ -1302,7 +1322,7 @@ config SENSORS_W83L785TS
 
 config SENSORS_W83L786NG
        tristate "Winbond W83L786NG, W83L786NR"
-       depends on I2C && EXPERIMENTAL
+       depends on I2C
        help
          If you say yes here you get support for the Winbond W83L786NG
          and W83L786NR sensor chips.
@@ -1417,7 +1437,7 @@ config SENSORS_ACPI_POWER
 
 config SENSORS_ATK0110
        tristate "ASUS ATK0110"
-       depends on X86 && EXPERIMENTAL
+       depends on X86
        help
          If you say yes here you get support for the ACPI hardware
          monitoring interface found in many ASUS motherboards. This