Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

[pandora-kernel.git] / drivers / hwmon / Kconfig

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index cedd4b7..e8f44b5 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -148,6 +148,7 @@ config SENSORS_K8TEMP
 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.
@@ -520,6 +521,16 @@ config SENSORS_SMSC47B397
          This driver can also be built as a module.  If so, the module
          will be called smsc47b397.
 
+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_VIA686A
        tristate "VIA686A"
        depends on PCI
@@ -618,8 +629,7 @@ config SENSORS_W83627HF
 
 config SENSORS_W83627EHF
        tristate "Winbond W83627EHF/DHG"
-       depends on I2C && EXPERIMENTAL
-       select I2C_ISA
+       select HWMON_VID
        help
          If you say yes here you get support for the hardware
          monitoring functionality of the Winbond W83627EHF Super-I/O chip.
@@ -656,6 +666,7 @@ config SENSORS_APPLESMC
        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