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 120085c..68cf877 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -28,6 +28,17 @@ 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
        tristate "Abit uGuru (rev 1 & 2)"
        depends on X86 && EXPERIMENTAL
 config SENSORS_ABITUGURU
        tristate "Abit uGuru (rev 1 & 2)"
        depends on X86 && EXPERIMENTAL


@@ -180,21 +191,27 @@ config SENSORS_ADT7470
          will be called adt7470.
 
 config SENSORS_ADT7473
          will be called adt7470.
 
 config SENSORS_ADT7473

-       tristate "Analog Devices ADT7473"
+       tristate "Analog Devices ADT7473 (DEPRECATED)"

        depends on I2C && EXPERIMENTAL
        depends on I2C && EXPERIMENTAL

+       select SENSORS_ADT7475

        help
          If you say yes here you get support for the Analog Devices
          ADT7473 temperature monitoring chips.
 
        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
          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, ADT7475, ADT7476 and ADT7490"

        depends on I2C && EXPERIMENTAL
        depends on I2C && EXPERIMENTAL

+       select HWMON_VID

        help
          If you say yes here you get support for the Analog Devices
        help
          If you say yes here you get support for the Analog Devices

-         ADT7475 hardware monitoring chips.
+         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.
 
          This driver can also be build as a module.  If so, the module
          will be called adt7475.


@@ -211,6 +228,18 @@ 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


@@ -248,18 +277,6 @@ config SENSORS_ASB100
          This driver can also be built as a module.  If so, the module
          will be called asb100.
 
          This driver can also be built as a module.  If so, the module
          will be called asb100.
 

-config SENSORS_ATK0110
-       tristate "ASUS ATK0110 ACPI hwmon"
-       depends on X86 && ACPI && 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_ATXP1
        tristate "Attansic ATXP1 VID controller"
        depends on I2C && EXPERIMENTAL
 config SENSORS_ATXP1
        tristate "Attansic ATXP1 VID controller"
        depends on I2C && EXPERIMENTAL


@@ -306,12 +323,12 @@ config SENSORS_F71805F
          will be called f71805f.
 
 config SENSORS_F71882FG
          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
        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.
 
          This driver can also be built as a module.  If so, the module
          will be called f71882fg.


@@ -326,34 +343,6 @@ config SENSORS_F75375S
          This driver can also be built as a module.  If so, the module
          will be called 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
 config SENSORS_FSCHMD
        tristate "Fujitsu Siemens Computers sensor chips"
        depends on X86 && I2C


@@ -402,12 +391,12 @@ 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"
 
 config SENSORS_IBMAEM
        tristate "IBM Active Energy Manager temperature/power sensors and control"


@@ -471,6 +460,15 @@ config SENSORS_LM70
          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
 config SENSORS_LM75
        tristate "National Semiconductor LM75 and compatibles"
        depends on I2C


@@ -704,7 +702,7 @@ config SENSORS_SHT15
 
 config SENSORS_S3C
        tristate "S3C24XX/S3C64XX Inbuilt ADC"
 
 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
        help
          If you say yes here you get support for the on-board ADCs of
          the Samsung S3C24XX or S3C64XX series of SoC


@@ -794,6 +792,16 @@ config SENSORS_ADS7828
          This driver can also be built as a module.  If so, the module
          will be called ads7828.
 
          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
 config SENSORS_THMC50
        tristate "Texas Instruments THMC50 / Analog Devices ADM1022"
        depends on I2C && EXPERIMENTAL


@@ -814,6 +822,24 @@ config SENSORS_TMP401
          This driver can also be built as a module.  If so, the module
          will be called tmp401.
 
          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"
        depends on PCI
 config SENSORS_VIA686A
        tristate "VIA686A"
        depends on PCI


@@ -860,7 +886,7 @@ config SENSORS_W83781D
 
 config SENSORS_W83791D
        tristate "Winbond W83791D"
 
 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.


@@ -937,6 +963,17 @@ 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_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
 config SENSORS_WM8350
        tristate "Wolfson Microelectronics WM835x"
        depends on MFD_WM8350


@@ -974,50 +1011,39 @@ 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_LIS3LV02D
-       tristate "STMicroeletronics LIS3LV02Dx three-axis digital accelerometer"
-       depends on ACPI && INPUT
+config SENSORS_LIS3_SPI
+       tristate "STMicroeletronics LIS3LV02Dx three-axis digital accelerometer (SPI)"
+       depends on !ACPI && SPI_MASTER && INPUT

        select INPUT_POLLDEV
        select INPUT_POLLDEV

-       select NEW_LEDS
-       select LEDS_CLASS

        default n
        help
        default n
        help

-         This driver provides support for the LIS3LV02Dx accelerometer. 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). The
-         accelerometer might also be found in other systems, connected via SPI
-         or I2C.  The accelerometer data is readable via
+         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
          /sys/devices/platform/lis3lv02d.
 
          This driver also provides an absolute input class device, allowing

-         the laptop to act as a pinball machine-esque joystick. On HP laptops,
-         if the led infrastructure is activated, support for a led indicating
-         disk protection will be provided as hp:red:hddprotection.
+         the laptop to act as a pinball machine-esque joystick.

 
          This driver can also be built as modules.  If so, the core module
 
          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.
+         will be called lis3lv02d and a specific module for the SPI transport
+         is called lis3lv02d_spi.

 
 

-config SENSORS_LIS3_SPI
-       tristate "STMicroeletronics LIS3LV02Dx three-axis digital accelerometer (SPI)"
-       depends on !ACPI && SPI_MASTER && INPUT
+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
        select INPUT_POLLDEV
        default n
        help
          This driver provides support for the LIS3LV02Dx accelerometer connected

-         via SPI. The accelerometer data is readable via
+         via I2C. The accelerometer data is readable via

          /sys/devices/platform/lis3lv02d.
 
          This driver also provides an absolute input class device, allowing
          /sys/devices/platform/lis3lv02d.
 
          This driver also provides an absolute input class device, allowing

-         the laptop to act as a pinball machine-esque joystick.
+         the device to act as a pinball machine-esque joystick.

 
          This driver can also be built as modules.  If so, the core module
 
          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.
+         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)"
 
 config SENSORS_APPLESMC
        tristate "Apple SMC (Motion sensor, light sensor, keyboard backlight)"


@@ -1044,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