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 192953b..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.
@@ -665,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