Merge branch 'upstream' into for-linus

[platform/kernel/linux-rpi.git] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 4340993..d51f014 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -148,6 +148,12 @@ config HID_EGALAX
        ---help---
        Support for the eGalax dual-touch panel.
 
+config HID_ELECOM
+       tristate "ELECOM"
+       depends on BT_HIDP
+       ---help---
+       Support for the ELECOM BM084 (bluetooth mouse).
+
 config HID_EZKEY
        tristate "Ezkey" if EMBEDDED
        depends on USB_HID