netns xfrm: fix "ip xfrm state|policy count" misreport

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

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 1d9be07..68cf877 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -28,18 +28,56 @@ config HWMON_VID
        tristate
        default n
 
        tristate
        default n
 

+config HWMON_DEBUG_CHIP
+       bool "Hardware Monitoring Chip debugging messages"
+       default n
+       help
+         Say Y here if you want the I2C chip drivers to produce a bunch of
+         debug messages to the system log.  Select this if you are having
+         a problem with I2C support and want to see more of what is going
+         on.
+
+comment "Native drivers"
+

 config SENSORS_ABITUGURU
 config SENSORS_ABITUGURU

-       tristate "Abit uGuru"
-       depends on EXPERIMENTAL
+       tristate "Abit uGuru (rev 1 & 2)"
+       depends on X86 && EXPERIMENTAL

        help
        help

-         If you say yes here you get support for the Abit uGuru chips
-         sensor part. The voltage and frequency control parts of the Abit
-         uGuru are not supported. The Abit uGuru chip can be found on Abit
-         uGuru featuring motherboards (most modern Abit motherboards).
+         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
+         control parts of the Abit uGuru are not supported. The Abit uGuru
+         chip can be found on Abit uGuru featuring motherboards (most modern
+         Abit motherboards from before end 2005). For more info and a list
+         of which motherboards have which revision see
+         Documentation/hwmon/abituguru

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

+config SENSORS_ABITUGURU3
+       tristate "Abit uGuru (rev 3)"
+       depends on X86 && EXPERIMENTAL
+       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
+         and their settings is supported. The third revision of the Abit
+         uGuru chip can be found on recent Abit motherboards (since end
+         2005). For more info and a list of which motherboards have which
+         revision see Documentation/hwmon/abituguru3
+
+         This driver can also be built as a module.  If so, the module
+         will be called abituguru3.
+
+config SENSORS_AD7414
+       tristate "Analog Devices AD7414"
+       depends on I2C && EXPERIMENTAL
+       help
+         If you say yes here you get support for the Analog Devices
+         AD7414 temperature monitoring chip.
+
+         This driver can also be built as a module. If so, the module
+         will be called ad7414.
+

 config SENSORS_AD7418
        tristate "Analog Devices AD7416, AD7417 and AD7418"
        depends on I2C && EXPERIMENTAL
 config SENSORS_AD7418
        tristate "Analog Devices AD7416, AD7417 and AD7418"
        depends on I2C && EXPERIMENTAL


@@ -50,6 +88,22 @@ config SENSORS_AD7418
          This driver can also be built as a module. If so, the module
          will be called ad7418.
 
          This driver can also be built as a module. If so, the module
          will be called ad7418.
 

+config SENSORS_ADCXX
+       tristate "National Semiconductor ADCxxxSxxx"
+       depends on SPI_MASTER && EXPERIMENTAL
+       help
+         If you say yes here you get support for the National Semiconductor
+         ADC<bb><c>S<sss> chip family, where
+         * bb  is the resolution in number of bits (8, 10, 12)
+         * c   is the number of channels (1, 2, 4, 8)
+         * sss is the maximum conversion speed (021 for 200 kSPS, 051 for 500
+           kSPS and 101 for 1 MSPS)
+
+         Examples : ADC081S101, ADC124S501, ...
+
+         This driver can also be built as a module.  If so, the module
+         will be called adcxx.
+

 config SENSORS_ADM1021
        tristate "Analog Devices ADM1021 and compatibles"
        depends on I2C
 config SENSORS_ADM1021
        tristate "Analog Devices ADM1021 and compatibles"
        depends on I2C


@@ -107,7 +161,7 @@ config SENSORS_ADM1031
 
 config SENSORS_ADM9240
        tristate "Analog Devices ADM9240 and compatibles"
 
 config SENSORS_ADM9240
        tristate "Analog Devices ADM9240 and compatibles"

-       depends on I2C && EXPERIMENTAL
+       depends on I2C

        select HWMON_VID
        help
          If you say yes here you get support for Analog Devices ADM9240,
        select HWMON_VID
        help
          If you say yes here you get support for Analog Devices ADM9240,


@@ -116,6 +170,52 @@ config SENSORS_ADM9240
          This driver can also be built as a module.  If so, the module
          will be called adm9240.
 
          This driver can also be built as a module.  If so, the module
          will be called adm9240.
 

+config SENSORS_ADT7462
+       tristate "Analog Devices ADT7462"
+       depends on I2C && EXPERIMENTAL
+       help
+         If you say yes here you get support for the Analog Devices
+         ADT7462 temperature monitoring chips.
+
+         This driver can also be built as a module. If so, the module
+         will be called adt7462.
+
+config SENSORS_ADT7470
+       tristate "Analog Devices ADT7470"
+       depends on I2C && EXPERIMENTAL
+       help
+         If you say yes here you get support for the Analog Devices
+         ADT7470 temperature monitoring chips.
+
+         This driver can also be built as a module. If so, the module
+         will be called adt7470.
+
+config SENSORS_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 ADT7473, ADT7475, ADT7476 and ADT7490"
+       depends on I2C && EXPERIMENTAL
+       select HWMON_VID
+       help
+         If you say yes here you get support for the Analog Devices
+         ADT7473, ADT7475, ADT7476 and ADT7490 hardware monitoring
+         chips.
+
+         This driver can also be build as a module.  If so, the module
+         will be called adt7475.
+

 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


@@ -128,9 +228,22 @@ config SENSORS_K8TEMP
          This driver can also be built as a module.  If so, the module
          will be called k8temp.
 
          This driver can also be built as a module.  If so, the module
          will be called k8temp.
 

+config SENSORS_K10TEMP
+       tristate "AMD Phenom/Sempron/Turion/Opteron temperature sensor"
+       depends on X86 && PCI
+       help
+         If you say yes here you get support for the temperature
+         sensor(s) inside your CPU. Supported are later revisions of
+         the AMD Family 10h and all revisions of the AMD Family 11h
+         microarchitectures.
+
+         This driver can also be built as a module.  If so, the module
+         will be called k10temp.
+

 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.


@@ -155,7 +268,7 @@ config SENSORS_AMS_I2C
 
 config SENSORS_ASB100
        tristate "Asus ASB100 Bach"
 
 config SENSORS_ASB100
        tristate "Asus ASB100 Bach"

-       depends on I2C && EXPERIMENTAL
+       depends on X86 && I2C && EXPERIMENTAL

        select HWMON_VID
        help
          If you say yes here you get support for the ASB100 Bach sensor
        select HWMON_VID
        help
          If you say yes here you get support for the ASB100 Bach sensor


@@ -188,36 +301,73 @@ 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
 config SENSORS_F71805F

-       tristate "Fintek F71805F/FG and F71872F/FG"
+       tristate "Fintek F71805F/FG, F71806F/FG and F71872F/FG"

        depends on EXPERIMENTAL
        help
          If you say yes here you get support for hardware monitoring
        depends on EXPERIMENTAL
        help
          If you say yes here you get support for hardware monitoring

-         features of the Fintek F71805F/FG and F71872F/FG Super-I/O
-         chips.
+         features of the Fintek F71805F/FG, F71806F/FG and F71872F/FG
+         Super-I/O chips.

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

-config SENSORS_FSCHER
-       tristate "FSC Hermes"
-       depends on I2C
+config SENSORS_F71882FG
+       tristate "Fintek F71858FG, F71862FG, F71882FG, F71889FG and F8000"
+       depends on EXPERIMENTAL

        help
        help

-         If you say yes here you get support for Fujitsu Siemens
-         Computers Hermes sensor chips.
+         If you say yes here you get support for hardware monitoring
+         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
 
          This driver can also be built as a module.  If so, the module

-         will be called fscher.
+         will be called f71882fg.

 
 

-config SENSORS_FSCPOS
-       tristate "FSC Poseidon"
+config SENSORS_F75375S
+       tristate "Fintek F75375S/SP and F75373";
+       depends on I2C && EXPERIMENTAL
+       help
+         If you say yes here you get support for hardware monitoring
+         features of the Fintek F75375S/SP and F75373
+
+         This driver can also be built as a module.  If so, the module
+         will be called f75375s.
+
+config SENSORS_FSCHMD
+       tristate "Fujitsu Siemens Computers sensor chips"
+       depends on X86 && I2C
+       help
+         If you say yes here you get support for the following Fujitsu
+         Siemens Computers (FSC) sensor chips: Poseidon, Scylla, Hermes,
+         Heimdall, Heracles, Hades and Syleus including support for the
+         integrated watchdog.
+
+         This is a merged driver for FSC sensor chips replacing the fscpos,
+         fscscy and fscher drivers and adding support for several other FSC
+         sensor chips.
+
+         This driver can also be built as a module.  If so, the module
+         will be called fschmd.
+
+config SENSORS_G760A
+       tristate "GMT G760A"

        depends on I2C
        help
        depends on I2C
        help

-         If you say yes here you get support for Fujitsu Siemens
-         Computers Poseidon sensor chips.
+         If you say yes here you get support for Global Mixed-mode
+         Technology Inc G760A fan speed PWM controller chips.

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

-         will be called fscpos.
+         will be called g760a.

 
 config SENSORS_GL518SM
        tristate "Genesys Logic GL518SM"
 
 config SENSORS_GL518SM
        tristate "Genesys Logic GL518SM"


@@ -241,21 +391,48 @@ config SENSORS_GL520SM
          will be called gl520sm.
 
 config SENSORS_CORETEMP
          will be called gl520sm.
 
 config SENSORS_CORETEMP

-       tristate "Intel Core (2) Duo/Solo temperature sensor"
-       depends on X86 && EXPERIMENTAL
+       tristate "Intel Core/Core2/Atom temperature sensor"
+       depends on X86 && PCI && EXPERIMENTAL

        help
          If you say yes here you get support for the temperature
        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"
+       select IPMI_SI
+       depends on IPMI_HANDLER
+       help
+         If you say yes here you get support for the temperature and
+         power sensors and capping hardware in various IBM System X
+         servers that support Active Energy Manager.  This includes
+         the x3350, x3550, x3650, x3655, x3755, x3850 M2, x3950 M2,
+         and certain HC10/HS2x/LS2x/QS2x blades.
+
+         This driver can also be built as a module.  If so, the module
+         will be called ibmaem.
+
+config SENSORS_IBMPEX
+       tristate "IBM PowerExecutive temperature/power sensors"
+       select IPMI_SI
+       depends on IPMI_HANDLER
+       help
+         If you say yes here you get support for the temperature and
+         power sensors in various IBM System X servers that support
+         PowerExecutive.  So far this includes the x3350, x3550, x3650,
+         x3655, and x3755; the x3800, x3850, and x3950 models that have
+         PCI Express; and some of the HS2x, LS2x, and QS2x blades.
+
+         This driver can also be built as a module.  If so, the module
+         will be called ibmpex.

 
 config SENSORS_IT87
        tristate "ITE IT87xx and compatibles"
 
 config SENSORS_IT87
        tristate "ITE IT87xx and compatibles"

-       depends on I2C
-       select I2C_ISA

        select HWMON_VID
        help
          If you say yes here you get support for ITE IT8705F, IT8712F,
        select HWMON_VID
        help
          If you say yes here you get support for ITE IT8705F, IT8712F,

-         IT8716F and IT8718F sensor chips, and the SiS960 clone.
+         IT8716F, IT8718F, IT8720F and IT8726F sensor chips, and the
+         SiS960 clone.

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


@@ -273,26 +450,47 @@ config SENSORS_LM63
          will be called lm63.
 
 config SENSORS_LM70
          will be called lm63.
 
 config SENSORS_LM70

-       tristate "National Semiconductor LM70"
+       tristate "National Semiconductor LM70 / Texas Instruments TMP121"

        depends on SPI_MASTER && EXPERIMENTAL
        help
          If you say yes here you get support for the National Semiconductor
        depends on SPI_MASTER && EXPERIMENTAL
        help
          If you say yes here you get support for the National Semiconductor

-         LM70 digital temperature sensor chip.
+         LM70 and Texas Instruments TMP121/TMP123 digital temperature
+         sensor chips.

 
          This driver can also be built as a module.  If so, the module
          will be called 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
        help
 config SENSORS_LM75
        tristate "National Semiconductor LM75 and compatibles"
        depends on I2C
        help

-         If you say yes here you get support for National Semiconductor LM75
-         sensor chips and clones: Dallas Semiconductor DS75 and DS1775 (in
-         9-bit precision mode), and TelCom (now Microchip) TCN75.
+         If you say yes here you get support for one common type of
+         temperature sensor chip, with models including:
+
+               - Dallas Semiconductor DS75 and DS1775
+               - Maxim MAX6625 and MAX6626
+               - Microchip MCP980x
+               - National Semiconductor LM75
+               - NXP's LM75A
+               - ST Microelectronics STDS75
+               - TelCom (now Microchip) TCN75
+               - Texas Instruments TMP100, TMP101, TMP75, TMP175, TMP275

 
 

-         The DS75 and DS1775 in 10- to 12-bit precision modes will require
-         a force module parameter. The driver will not handle the extra
-         precision anyhow.
+         This driver supports driver model based binding through board
+         specific I2C device tables.
+
+         It also supports the "legacy" style of driver binding.  To use
+         that with some chips which don't replicate LM75 quirks exactly,
+         you may need the "force" module parameter.

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


@@ -350,12 +548,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.


@@ -365,11 +563,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 and
-         MAX6658 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, MAX6648, MAX6649, MAX6657, MAX6658, MAX6659,
+         MAX6680, MAX6681 and MAX6692 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.


@@ -384,6 +580,57 @@ config SENSORS_LM92
          This driver can also be built as a module.  If so, the module
          will be called lm92.
 
          This driver can also be built as a module.  If so, the module
          will be called lm92.
 

+config SENSORS_LM93
+       tristate "National Semiconductor LM93 and compatibles"
+       depends on I2C
+       select HWMON_VID
+       help
+         If you say yes here you get support for National Semiconductor LM93
+         sensor chips.
+
+         This driver can also be built as a module.  If so, the module
+         will be called lm93.
+
+config SENSORS_LTC4215
+       tristate "Linear Technology LTC4215"
+       depends on I2C && EXPERIMENTAL
+       default n
+       help
+         If you say yes here you get support for Linear Technology LTC4215
+         Hot Swap Controller I2C interface.
+
+         This driver can also be built as a module. If so, the module will
+         be called ltc4215.
+
+config SENSORS_LTC4245
+       tristate "Linear Technology LTC4245"
+       depends on I2C && EXPERIMENTAL
+       default n
+       help
+         If you say yes here you get support for Linear Technology LTC4245
+         Multiple Supply Hot Swap Controller I2C interface.
+
+         This driver can also be built as a module. If so, the module will
+         be called ltc4245.
+
+config SENSORS_LM95241
+       tristate "National Semiconductor LM95241 sensor chip"
+       depends on I2C
+       help
+         If you say yes here you get support for LM95241 sensor chip.
+
+         This driver can also be built as a module.  If so, the module
+         will be called lm95241.
+
+config SENSORS_MAX1111
+       tristate "Maxim MAX1111 Multichannel, Serial 8-bit ADC chip"
+       depends on SPI_MASTER
+       help
+         Say y here to support Maxim's MAX1111 ADC chips.
+
+         This driver can also be built as a module.  If so, the module
+         will be called max1111.
+

 config SENSORS_MAX1619
        tristate "Maxim MAX1619 sensor chip"
        depends on I2C
 config SENSORS_MAX1619
        tristate "Maxim MAX1619 sensor chip"
        depends on I2C


@@ -429,10 +676,50 @@ config SENSORS_PC87427
          This driver can also be built as a module.  If so, the module
          will be called pc87427.
 
          This driver can also be built as a module.  If so, the module
          will be called pc87427.
 

+config SENSORS_PCF8591
+       tristate "Philips PCF8591 ADC/DAC"
+       depends on I2C
+       default n
+       help
+         If you say yes here you get support for Philips PCF8591 4-channel
+         ADC, 1-channel DAC chips.
+
+         This driver can also be built as a module.  If so, the module
+         will be called 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_S3C
+       tristate "S3C24XX/S3C64XX Inbuilt ADC"
+       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
+
+         This driver can also be built as a module. If so, the module
+         will be called s3c-hwmo.
+
+config SENSORS_S3C_RAW
+       bool "Include raw channel attributes in sysfs"
+       depends on SENSORS_S3C
+       help
+         Say Y here if you want to include raw copies of all the ADC
+         channels in sysfs.
+

 config SENSORS_SIS5595
        tristate "Silicon Integrated Systems Corp. SiS5595"
 config SENSORS_SIS5595
        tristate "Silicon Integrated Systems Corp. SiS5595"

-       depends on I2C && PCI && EXPERIMENTAL
-       select I2C_ISA
+       depends on PCI

        help
          If you say yes here you get support for the integrated sensors in
          SiS5595 South Bridges.
        help
          If you say yes here you get support for the integrated sensors in
          SiS5595 South Bridges.


@@ -441,13 +728,13 @@ config SENSORS_SIS5595
          will be called sis5595.
 
 config SENSORS_DME1737
          will be called sis5595.
 
 config SENSORS_DME1737

-       tristate "SMSC DME1737 and compatibles"
+       tristate "SMSC DME1737, SCH311x and compatibles"

        depends on I2C && EXPERIMENTAL
        select HWMON_VID
        help
          If you say yes here you get support for the hardware monitoring
        depends on I2C && EXPERIMENTAL
        select HWMON_VID
        help
          If you say yes here you get support for the hardware monitoring

-         and fan control features of the SMSC DME1737 (and compatibles
-         like the Asus A8000) Super-I/O chip.
+         and fan control features of the SMSC DME1737, SCH311x, SCH5027, and
+         Asus A8000 Super-I/O chips.

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


@@ -495,10 +782,67 @@ 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_AMC6821
+       tristate "Texas Instruments AMC6821"
+       depends on I2C  && EXPERIMENTAL
+       help
+         If you say yes here you get support for the Texas Instruments
+         AMC6821 hardware monitoring chips.
+
+         This driver can also be build as a module.  If so, the module
+         will be called amc6821.
+
+config SENSORS_THMC50
+       tristate "Texas Instruments THMC50 / Analog Devices ADM1022"
+       depends on I2C && EXPERIMENTAL
+       help
+         If you say yes here you get support for Texas Instruments THMC50
+         sensor chips and clones: the Analog Devices ADM1022.
+
+         This driver can also be built as a module.  If so, the module
+         will be called thmc50.
+
+config SENSORS_TMP401
+       tristate "Texas Instruments TMP401 and compatibles"
+       depends on I2C && EXPERIMENTAL
+       help
+         If you say yes here you get support for Texas Instruments TMP401 and
+         TMP411 temperature sensor chips.
+
+         This driver can also be built as a module.  If so, the module
+         will be called tmp401.
+
+config SENSORS_TMP421
+       tristate "Texas Instruments TMP421 and compatible"
+       depends on I2C && EXPERIMENTAL
+       help
+         If you say yes here you get support for Texas Instruments TMP421,
+         TMP422 and TMP423 temperature sensor chips.
+
+         This driver can also be built as a module.  If so, the module
+         will be called tmp421.
+
+config SENSORS_VIA_CPUTEMP
+       tristate "VIA CPU temperature sensor"
+       depends on X86
+       help
+         If you say yes here you get support for the temperature
+         sensor inside your CPU. Supported are all known variants of
+         the VIA C7 and Nano.
+

 config SENSORS_VIA686A
        tristate "VIA686A"
 config SENSORS_VIA686A
        tristate "VIA686A"

-       depends on I2C && PCI
-       select I2C_ISA
+       depends on PCI

        help
          If you say yes here you get support for the integrated sensors in
          Via 686A/B South Bridges.
        help
          If you say yes here you get support for the integrated sensors in
          Via 686A/B South Bridges.


@@ -519,9 +863,8 @@ config SENSORS_VT1211
 
 config SENSORS_VT8231
        tristate "VIA VT8231"
 
 config SENSORS_VT8231
        tristate "VIA VT8231"

-       depends on I2C && PCI && EXPERIMENTAL
+       depends on PCI

        select HWMON_VID
        select HWMON_VID

-       select I2C_ISA

        help
          If you say yes here then you get support for the integrated sensors
          in the VIA VT8231 device.
        help
          If you say yes here then you get support for the integrated sensors
          in the VIA VT8231 device.


@@ -530,20 +873,20 @@ 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.
 
 config SENSORS_W83791D
        tristate "Winbond W83791D"
 
          This driver can also be built as a module.  If so, the module
          will be called 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.
        select HWMON_VID
        help
          If you say yes here you get support for the Winbond W83791D chip.


@@ -582,6 +925,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


@@ -594,24 +947,54 @@ config SENSORS_W83627HF
          will be called w83627hf.
 
 config SENSORS_W83627EHF
          will be called w83627hf.
 
 config SENSORS_W83627EHF

-       tristate "Winbond W83627EHF"
-       depends on I2C && EXPERIMENTAL
-       select I2C_ISA
+       tristate "Winbond W83627EHF/EHG/DHG, W83667HG"
+       select HWMON_VID

        help
        help

-         If you say yes here you get preliminary support for the hardware
+         If you say yes here you get support for the hardware

          monitoring functionality of the Winbond W83627EHF Super-I/O chip.
          monitoring functionality of the Winbond W83627EHF Super-I/O chip.

-         Only fan and temperature inputs are supported at the moment, while
-         the chip does much more than that.

 
          This driver also supports the W83627EHG, which is the lead-free
 
          This driver also supports the W83627EHG, which is the lead-free

-         version of the W83627EHF.
+         version of the W83627EHF, and the W83627DHG, which is a similar
+         chip suited for specific Intel processors that use PECI such as
+         the Core 2 Duo.
+
+         This driver also supports the W83667HG chip.

 
          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_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
+       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

+       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


@@ -628,11 +1011,46 @@ config SENSORS_HDAPS
          Say Y here if you have an applicable laptop and want to experience
          the awesome power of hdaps.
 
          Say Y here if you have an applicable laptop and want to experience
          the awesome power of hdaps.
 

+config SENSORS_LIS3_SPI
+       tristate "STMicroeletronics LIS3LV02Dx three-axis digital accelerometer (SPI)"
+       depends on !ACPI && SPI_MASTER && INPUT
+       select INPUT_POLLDEV
+       default n
+       help
+         This driver provides support for the LIS3LV02Dx accelerometer connected
+         via SPI. The accelerometer data is readable via
+         /sys/devices/platform/lis3lv02d.
+
+         This driver also provides an absolute input class device, allowing
+         the laptop to act as a pinball machine-esque joystick.
+
+         This driver can also be built as modules.  If so, the core module
+         will be called lis3lv02d and a specific module for the SPI transport
+         is called lis3lv02d_spi.
+
+config SENSORS_LIS3_I2C
+       tristate "STMicroeletronics LIS3LV02Dx three-axis digital accelerometer (I2C)"
+       depends on I2C && INPUT
+       select INPUT_POLLDEV
+       default n
+       help
+         This driver provides support for the LIS3LV02Dx accelerometer connected
+         via I2C. The accelerometer data is readable via
+         /sys/devices/platform/lis3lv02d.
+
+         This driver also provides an absolute input class device, allowing
+         the device to act as a pinball machine-esque joystick.
+
+         This driver can also be built as modules.  If so, the core module
+         will be called lis3lv02d and a specific module for the I2C transport
+         is called lis3lv02d_i2c.
+

 config SENSORS_APPLESMC
        tristate "Apple SMC (Motion sensor, light sensor, keyboard backlight)"
        depends on INPUT && X86
        select NEW_LEDS
        select LEDS_CLASS
 config SENSORS_APPLESMC
        tristate "Apple SMC (Motion sensor, light sensor, keyboard backlight)"
        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


@@ -652,13 +1070,58 @@ config SENSORS_APPLESMC
          Say Y here if you have an applicable laptop and want to experience
          the awesome power of applesmc.
 
          Say Y here if you have an applicable laptop and want to experience
          the awesome power of applesmc.
 

-config HWMON_DEBUG_CHIP
-       bool "Hardware Monitoring Chip debugging messages"
+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"
+
+config SENSORS_ATK0110
+       tristate "ASUS ATK0110"
+       depends on X86 && EXPERIMENTAL
+       help
+         If you say yes here you get support for the ACPI hardware
+         monitoring interface found in many ASUS motherboards. This
+         driver will provide readings of fans, voltages and temperatures
+         through the system firmware.
+
+         This driver can also be built as a module. If so, the module
+         will be called asus_atk0110.
+
+config SENSORS_LIS3LV02D
+       tristate "STMicroeletronics LIS3* three-axis digital accelerometer"
+       depends on INPUT
+       select INPUT_POLLDEV
+       select NEW_LEDS
+       select LEDS_CLASS

        default n
        help
        default n
        help

-         Say Y here if you want the I2C chip drivers to produce a bunch of
-         debug messages to the system log.  Select this if you are having
-         a problem with I2C support and want to see more of what is going
-         on.
+         This driver provides support for the LIS3* accelerometers, such as the
+         LIS3LV02DL or the LIS331DL. In particular, it can be found in a number
+         of HP laptops, which have the "Mobile Data Protection System 3D" or
+         "3D DriveGuard" feature. On such systems the driver should load
+         automatically (via ACPI alias). The accelerometer might also be found
+         in other systems, connected via SPI or I2C. The accelerometer data is
+         readable via /sys/devices/platform/lis3lv02d.
+
+         This driver also provides an absolute input class device, allowing
+         a laptop to act as a pinball machine-esque joystick. It provides also
+         a misc device which can be used to detect free-fall. On HP laptops,
+         if the led infrastructure is activated, support for a led indicating
+         disk protection will be provided as hp::hddprotect. For more
+         information on the feature, refer to Documentation/hwmon/lis3lv02d.
+
+         This driver can also be built as modules.  If so, the core module
+         will be called lis3lv02d and a specific module for HP laptops will be
+         called hp_accel.
+
+         Say Y here if you have an applicable laptop and want to experience
+         the awesome power of lis3lv02d.
+
+endif # ACPI

 
 endif # HWMON
 
 endif # HWMON