Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...

[linux-2.6] / drivers / input / joystick / Kconfig

diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig
index b0023452ec90a78c7297804ded4c0c3757d900dd..7c662ee594a3e9fdf85761765ae6776ddecf05d9 100644 (file)
--- a/drivers/input/joystick/Kconfig
+++ b/drivers/input/joystick/Kconfig
@@ -268,4 +268,18 @@ config JOYSTICK_XPAD
          To compile this driver as a module, choose M here: the
          module will be called xpad.
 
+config JOYSTICK_XPAD_FF
+       bool "X-Box gamepad rumble support"
+       depends on JOYSTICK_XPAD && INPUT
+       select INPUT_FF_MEMLESS
+       ---help---
+         Say Y here if you want to take advantage of xbox 360 rumble features.
+
+config JOYSTICK_XPAD_LEDS
+       bool "LED Support for Xbox360 controller 'BigX' LED"
+       depends on JOYSTICK_XPAD && (LEDS_CLASS=y || LEDS_CLASS=JOYSTICK_XPAD)
+       ---help---
+         This option enables support for the LED which surrounds the Big X on
+         XBox 360 controller.
+
 endif