Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

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

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 7a67487..a95a7cb 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -405,14 +405,25 @@ config HOLTEK_FF
          Say Y here if you have a Holtek On Line Grip based game controller
          and want to have force feedback support for it.
 
+config HID_VIVALDI_COMMON
+       tristate
+       help
+         ChromeOS Vivaldi HID parsing support library. This is a hidden
+         option so that drivers can use common code to parse the HID
+         descriptors for vivaldi function row keymap.
+
 config HID_GOOGLE_HAMMER
        tristate "Google Hammer Keyboard"
+       select HID_VIVALDI_COMMON
+       select INPUT_VIVALDIFMAP
        depends on USB_HID && LEDS_CLASS && CROS_EC
        help
        Say Y here if you have a Google Hammer device.
 
 config HID_VIVALDI
        tristate "Vivaldi Keyboard"
+       select HID_VIVALDI_COMMON
+       select INPUT_VIVALDIFMAP
        depends on HID
        help
          Say Y here if you want to enable support for Vivaldi keyboards.