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

[linux-2.6] / drivers / hwmon / Kconfig

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index dbdca6f10e46db2de7930cad8c579d533bb648b2..e8f44b580f0a91a1c1a77b0ce9cc7aaa03d997e3 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
 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.
        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.
 
          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
 config SENSORS_VIA686A
        tristate "VIA686A"
        depends on PCI


@@ -655,6 +666,7 @@ config SENSORS_APPLESMC
        depends on INPUT && X86
        select NEW_LEDS
        select LEDS_CLASS
        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
        default n
        help
          This driver provides support for the Apple System Management