Merge commit 'v3.1-rc4' into next

[pandora-kernel.git] / drivers / input / misc / Kconfig

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index e141deb..a1aa35a 100644 (file)
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -339,7 +339,7 @@ config INPUT_TWL4030_PWRBUTTON
 config INPUT_TWL4030_VIBRA
        tristate "Support for TWL4030 Vibrator"
        depends on TWL4030_CORE
-       select TWL4030_CODEC
+       select MFD_TWL4030_AUDIO
        select INPUT_FF_MEMLESS
        help
          This option enables support for TWL4030 Vibrator Driver.
@@ -347,6 +347,17 @@ config INPUT_TWL4030_VIBRA
          To compile this driver as a module, choose M here. The module will
          be called twl4030_vibra.
 
+config INPUT_TWL6040_VIBRA
+       tristate "Support for TWL6040 Vibrator"
+       depends on TWL4030_CORE
+       select TWL6040_CORE
+       select INPUT_FF_MEMLESS
+       help
+         This option enables support for TWL6040 Vibrator Driver.
+
+         To compile this driver as a module, choose M here. The module will
+         be called twl6040_vibra.
+
 config INPUT_UINPUT
        tristate "User level driver support"
        help