Merge branches 'for-4.3/chicony', 'for-4.3/cp2112', 'for-4.3/i2c-hid', 'for-4.3/lenov...

[linux-drm-fsl-dcu.git] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index cc4c6649d19503e236f905e8feafe21440237fea..6ab51ae3c39d5753f5315fd7451db737a311a24e 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -251,6 +251,12 @@ config HID_EZKEY
        ---help---
        Support for Ezkey BTC 8193 keyboard.
 
+config HID_GEMBIRD
+       tristate "Gembird Joypad"
+       depends on HID
+       ---help---
+       Support for Gembird JPD-DualForce 2.
+
 config HID_HOLTEK
        tristate "Holtek HID devices"
        depends on USB_HID
@@ -480,6 +486,7 @@ config HID_MULTITOUCH
          - Atmel panels
          - Cando dual touch panels
          - Chunghwa panels
+         - CJTouch panels
          - CVTouch panels
          - Cypress TrueTouch panels
          - Elan Microelectronics touch panels