Merge branch 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm

[~andy/linux] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 617ed7db67d1e24b39ccceb413f3657005b6f762..71d4c0703629a55331aed27e12aa17cd63ffa66c 100644 (file)
--- 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
@@ -204,6 +213,12 @@ config HID_MICROSOFT
        ---help---
        Support for Microsoft devices that are not fully compliant with HID standard.
 
+config HID_MOSART
+       tristate "MosArt"
+       depends on USB_HID
+       ---help---
+       Support for MosArt dual-touch panels.
+
 config HID_MONTEREY
        tristate "Monterey" if EMBEDDED
        depends on USB_HID