RDMA/nes: Fix incorrect unlock in nes_process_mac_intr()

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

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index be8eead..9be8e17 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -170,6 +170,16 @@ config SENSORS_ADM9240
          This driver can also be built as a module.  If so, the module
          will be called adm9240.
 
+config SENSORS_ADT7411
+       tristate "Analog Devices ADT7411"
+       depends on I2C && EXPERIMENTAL
+       help
+         If you say yes here you get support for the Analog Devices
+         ADT7411 voltage and temperature monitoring chip.
+
+         This driver can also be built as a module. If so, the module
+         will be called adt7411.
+
 config SENSORS_ADT7462
        tristate "Analog Devices ADT7462"
        depends on I2C && EXPERIMENTAL
@@ -190,20 +200,6 @@ config SENSORS_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 (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
@@ -216,6 +212,19 @@ config SENSORS_ADT7475
          This driver can also be build as a module.  If so, the module
          will be called adt7475.
 
+config SENSORS_ASC7621
+       tristate "Andigilog aSC7621"
+       depends on HWMON && I2C
+       help
+         If you say yes here you get support for the aSC7621
+         family of SMBus sensors chip found on most Intel X38, X48, X58,
+         945, 965 and 975 desktop boards.  Currently supported chips:
+         aSC7621
+         aSC7621a
+
+         This driver can also be built as a module.  If so, the module
+         will be called asc7621.
+
 config SENSORS_K8TEMP
        tristate "AMD Athlon64/FX or Opteron temperature sensor"
        depends on X86 && PCI && EXPERIMENTAL
@@ -392,7 +401,7 @@ config SENSORS_GL520SM
 
 config SENSORS_CORETEMP
        tristate "Intel Core/Core2/Atom temperature sensor"
-       depends on X86 && EXPERIMENTAL
+       depends on X86 && PCI && EXPERIMENTAL
        help
          If you say yes here you get support for the temperature
          sensor inside your CPU. Most of the family 6 CPUs
@@ -563,9 +572,10 @@ config SENSORS_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 ADT7461, and Maxim
+         LM86, LM89 and LM99, Analog Devices ADM1032 and ADT7461, Maxim
          MAX6646, MAX6647, MAX6648, MAX6649, MAX6657, MAX6658, MAX6659,
-         MAX6680, MAX6681 and MAX6692 sensor chips.
+         MAX6680, MAX6681 and MAX6692, and Winbond/Nuvoton W83L771AWG/ASG
+         sensor chips.
 
          This driver can also be built as a module.  If so, the module
          will be called lm90.
@@ -792,6 +802,16 @@ config SENSORS_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
@@ -899,7 +919,8 @@ config SENSORS_W83793
        select HWMON_VID
        help
          If you say yes here you get support for the Winbond W83793
-         hardware monitoring chip.
+         hardware monitoring chip, including support for the integrated
+         watchdog.
 
          This driver can also be built as a module.  If so, the module
          will be called w83793.
@@ -1018,6 +1039,23 @@ config SENSORS_LIS3_SPI
          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