aboutsummaryrefslogtreecommitdiff
path: root/drivers/hid/Kconfig
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-08-04 15:29:35 +0200
committerJiri Kosina <jkosina@suse.cz>2010-08-04 15:29:35 +0200
commit35d03a0d9b22fdf7cba75cd41a6f0a039ba35cdd (patch)
tree1f85aa8bd902aae76beb1c9deb20557a2e71fe9c /drivers/hid/Kconfig
parent9929ffed889b4861b52ba648a44fa4add945c4d1 (diff)
parent7d3d42a79519df4cd62c3aa5d9ae2d77ebbf8fab (diff)
downloadlinux-2.6.38-lt-ux500-35d03a0d9b22fdf7cba75cd41a6f0a039ba35cdd.tar.gz
Merge branch 'acrux' into for-linus
Conflicts: drivers/hid/hid-ids.h
Diffstat (limited to 'drivers/hid/Kconfig')
-rw-r--r--drivers/hid/Kconfig8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index f54050c2e38..6369ba7f96f 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -68,6 +68,14 @@ config HID_A4TECH
---help---
Support for A4 tech X5 and WOP-35 / Trust 450L mice.
+config HID_ACRUX_FF
+ tristate "ACRUX force feedback support"
+ depends on USB_HID
+ select INPUT_FF_MEMLESS
+ ---help---
+ Say Y here if you want to enable force feedback support for ACRUX
+ game controllers.
+
config HID_APPLE
tristate "Apple" if EMBEDDED
depends on (USB_HID || BT_HIDP)