Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / hwmon / Kconfig

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 5eecb51f11484d1dcff070c0f9e891915d0fdbd3..eaa3e37e8a0e55438bcca82757180f3e9398e573 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -189,6 +189,16 @@ config SENSORS_ADT7473
          This driver can also be built as a module. If so, the module
          will be called adt7473.
 
+config SENSORS_ADT7475
+       tristate "Analog Devices ADT7475"
+       depends on I2C && EXPERIMENTAL
+       help
+         If you say yes here you get support for the Analog Devices
+         ADT7475 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
@@ -284,11 +294,12 @@ config SENSORS_F71805F
          will be called f71805f.
 
 config SENSORS_F71882FG
-       tristate "Fintek F71882FG and F71883FG"
+       tristate "Fintek F71862FG, F71882FG and F8000"
        depends on EXPERIMENTAL
        help
          If you say yes here you get support for hardware monitoring
-         features of the Fintek F71882FG and F71883FG Super-I/O chips.
+         features of the Fintek F71882FG/F71883FG, F71862FG/71863FG
+         and F8000 Super-I/O chips.
 
          This driver can also be built as a module.  If so, the module
          will be called f71882fg.
@@ -304,9 +315,13 @@ config SENSORS_F75375S
          will be called f75375s.
 
 config SENSORS_FSCHER
-       tristate "FSC Hermes"
+       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.
 
@@ -314,9 +329,13 @@ config SENSORS_FSCHER
          will be called fscher.
 
 config SENSORS_FSCPOS
-       tristate "FSC Poseidon"
+       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.
 
@@ -325,14 +344,15 @@ config SENSORS_FSCPOS
 
 config SENSORS_FSCHMD
        tristate "FSC Poseidon, Scylla, Hermes, Heimdall and Heracles"
-       depends on X86 && I2C && EXPERIMENTAL
+       depends on X86 && I2C
        help
          If you say yes here you get support for various Fujitsu Siemens
-         Computers sensor chips.
+         Computers sensor chips, including support for the integrated
+         watchdog.
 
-         This is a new merged driver for FSC sensor chips which is intended
-         as a replacment for the fscpos, fscscy and fscher drivers and adds
-         support for several other FCS sensor chips.
+         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.
@@ -399,7 +419,8 @@ config SENSORS_IT87
        select HWMON_VID
        help
          If you say yes here you get support for ITE IT8705F, IT8712F,
-         IT8716F, IT8718F and IT8726F 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.
@@ -417,11 +438,12 @@ config SENSORS_LM63
          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
-         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.
@@ -548,6 +570,17 @@ config SENSORS_LM93
          This driver can also be built as a module.  If so, the module
          will be called lm93.
 
+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_MAX1111
        tristate "Maxim MAX1111 Multichannel, Serial 8-bit ADC chip"
        depends on SPI_MASTER
@@ -838,6 +871,8 @@ config SENSORS_HDAPS
 config SENSORS_LIS3LV02D
        tristate "STMicroeletronics LIS3LV02Dx three-axis digital accelerometer"
        depends on ACPI && INPUT
+       select NEW_LEDS
+       select LEDS_CLASS
        default n
        help
          This driver provides support for the LIS3LV02Dx accelerometer. In
@@ -849,10 +884,16 @@ config SENSORS_LIS3LV02D
          /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 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.
 
-         This driver can also be built as a module.  If so, the module
-         will be called 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.
 
 config SENSORS_APPLESMC
        tristate "Apple SMC (Motion sensor, light sensor, keyboard backlight)"