Merge git://oss.sgi.com:8090/xfs/xfs-2.6

[linux-drm-fsl-dcu.git] / drivers / hwmon / Kconfig

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 9b88b25b6edbdfb098dc189c1e54c0efb60e5b4b..891ef6d0b1bf970d2a1fd2e6aad9fa43ba16df6d 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -95,15 +95,42 @@ config SENSORS_ADM9240
          will be called adm9240.
 
 config SENSORS_K8TEMP
-       tristate "AMD K8 processor sensor"
+       tristate "AMD Athlon64/FX or Opteron temperature sensor"
        depends on HWMON && X86 && PCI && EXPERIMENTAL
        help
          If you say yes here you get support for the temperature
-         sensor(s) inside your AMD K8 CPU.
+         sensor(s) inside your CPU. Supported is whole AMD K8
+         microarchitecture. Please note that you will need at least
+         lm-sensors 2.10.1 for proper userspace support.
 
          This driver can also be built as a module.  If so, the module
          will be called k8temp.
 
+config SENSORS_AMS
+       tristate "Apple Motion Sensor driver"
+       depends on HWMON && PPC_PMAC && !PPC64 && INPUT && ((ADB_PMU && I2C = y) || (ADB_PMU && !I2C) || I2C) && EXPERIMENTAL
+       help
+         Support for the motion sensor included in PowerBooks. Includes
+         implementations for PMU and I2C.
+
+         This driver can also be built as a module. If so, the module
+         will be called ams.
+
+config SENSORS_AMS_PMU
+       bool "PMU variant"
+       depends on SENSORS_AMS && ADB_PMU
+       default y
+       help
+         PMU variant of motion sensor, found in late 2005 PowerBooks.
+
+config SENSORS_AMS_I2C
+       bool "I2C variant"
+       depends on SENSORS_AMS && I2C
+       default y
+       help
+         I2C variant of motion sensor, found in early 2005 PowerBooks and
+         iBooks.
+
 config SENSORS_ASB100
        tristate "Asus ASB100 Bach"
        depends on HWMON && I2C && EXPERIMENTAL
@@ -140,11 +167,12 @@ config SENSORS_DS1621
          will be called ds1621.
 
 config SENSORS_F71805F
-       tristate "Fintek F71805F/FG"
+       tristate "Fintek F71805F/FG and F71872F/FG"
        depends on HWMON && EXPERIMENTAL
        help
          If you say yes here you get support for hardware monitoring
-         features of the Fintek F71805F/FG chips.
+         features of the Fintek F71805F/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.
@@ -351,6 +379,19 @@ config SENSORS_PC87360
          This driver can also be built as a module.  If so, the module
          will be called pc87360.
 
+config SENSORS_PC87427
+       tristate "National Semiconductor PC87427"
+       depends on HWMON && EXPERIMENTAL
+       help
+         If you say yes here you get access to the hardware monitoring
+         functions of the National Semiconductor PC87427 Super-I/O chip.
+         The chip has two distinct logical devices, one for fan speed
+         monitoring and control, and one for voltage and temperature
+         monitoring. Only fan speed monitoring is supported right now.
+
+         This driver can also be built as a module.  If so, the module
+         will be called pc87427.
+
 config SENSORS_SIS5595
        tristate "Silicon Integrated Systems Corp. SiS5595"
        depends on HWMON && I2C && PCI && EXPERIMENTAL
@@ -369,8 +410,8 @@ config SENSORS_SMSC47M1
        help
          If you say yes here you get support for the integrated fan
          monitoring and control capabilities of the SMSC LPC47B27x,
-         LPC47M10x, LPC47M13x, LPC47M14x, LPC47M15x, LPC47M192 and
-         LPC47M997 chips.
+         LPC47M10x, LPC47M112, LPC47M13x, LPC47M14x, LPC47M15x,
+         LPC47M192 and LPC47M997 chips.
 
          The temperature and voltage sensor features of the LPC47M192
          and LPC47M997 are supported by another driver, select also
@@ -472,6 +513,16 @@ config SENSORS_W83792D
          This driver can also be built as a module.  If so, the module
          will be called w83792d.
 
+config SENSORS_W83793
+       tristate "Winbond W83793"
+       depends on HWMON && I2C && EXPERIMENTAL
+       help
+         If you say yes here you get support for the Winbond W83793
+         hardware monitoring chip.
+
+         This driver can also be built as a module.  If so, the module
+         will be called w83793.
+
 config SENSORS_W83L785TS
        tristate "Winbond W83L785TS-S"
        depends on HWMON && I2C && EXPERIMENTAL
@@ -525,6 +576,9 @@ config SENSORS_HDAPS
          This driver also provides an absolute input class device, allowing
          the laptop to act as a pinball machine-esque joystick.
 
+         If your ThinkPad is not recognized by the driver, please update to latest
+         BIOS. This is especially the case for some R52 ThinkPads.
+
          Say Y here if you have an applicable laptop and want to experience
          the awesome power of hdaps.