aboutsummaryrefslogtreecommitdiff
path: root/drivers/hid/Kconfig
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-02-25 17:39:16 +0100
committerJiri Kosina <jkosina@suse.cz>2010-02-25 17:39:16 +0100
commit14ef2b0c026558d37662e5e095d59c64597d5769 (patch)
tree230c09cc65bc94384c687fed87e6ada954f80609 /drivers/hid/Kconfig
parent57ab12e418ec4fe24c11788bb1bbdabb29d05679 (diff)
parent71b38bd4c1cc4f2b653064357e4efab77dfd711d (diff)
downloadlinux-2.6.38-lt-ux500-14ef2b0c026558d37662e5e095d59c64597d5769.tar.gz
Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' into for-linus
Conflicts: drivers/hid/Kconfig
Diffstat (limited to 'drivers/hid/Kconfig')
-rw-r--r--drivers/hid/Kconfig9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 2b93d7f647e..71d4c070362 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -197,6 +197,15 @@ config LOGIG940_FF
Say Y here if you want to enable force feedback support for Logitech
Flight System G940 devices.
+config HID_MAGICMOUSE
+ tristate "Apple MagicMouse multi-touch support"
+ depends on BT_HIDP
+ ---help---
+ Support for the Apple Magic Mouse multi-touch.
+
+ Say Y here if you want support for the multi-touch features of the
+ Apple Wireless "Magic" Mouse.
+
config HID_MICROSOFT
tristate "Microsoft" if EMBEDDED
depends on USB_HID